git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@52641 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 14 insertions, 74 deletions

diff --git a/ChangeLog b/ChangeLog
index fcedcbf3..7efb7288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Jun 16, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * libpcsxcore/psxcommon.c: Do not allow hotkeys inside a softcall from HLE
+   BIOS.
+ * configure.ac: Removed -fno-dse, which is no longer necessary.
+
 Jun 9, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * win32/pcsx.rc: Embed manifest properly under MSVC6.
diff --git a/configure b/configure
index 4fcead16..54dc8baf 100755
--- a/configure
+++ b/configure
@@ -1641,9 +1641,9 @@ Optional Features:
   --disable-nls           do not use Native Language Support
   --disable-rpath         do not hardcode runtime library paths
   --disable-sdltest       Do not try to compile and run a test SDL program
-  --enable-sound=...      force selection of sound backend (alsa, null, oss, pulseaudio, sdl) (default: sdl)
+  --enable-sound=...      force selection of sound backend (alsa/null/oss/pulseaudio/sdl) (default: sdl)
   --enable-opengl         build OpenGL plugin (default=no)
-  --enable-dynarec=...    force selection of dynamic recompiler platform (x86, x86_64, ppc) (default: autodetect)
+  --enable-dynarec=...    force selection of dynamic recompiler platform (auto/no/x86/x86_64/ppc) (default: auto)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -14515,64 +14515,6 @@ $as_echo "$as_me: error: *** SDL not found!" >&2;}
 ac_config_files="$ac_config_files Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in"
 
 
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fno-dse"
-{ $as_echo "$as_me:$LINENO: checking for -fno-dse option support" >&5
-$as_echo_n "checking for -fno-dse option support... " >&6; }
-if test "${ac_cv_c_no_dse_support+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_no_dse_support=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_c_no_dse_support=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_no_dse_support" >&5
-$as_echo "$ac_cv_c_no_dse_support" >&6; }
-CFLAGS="$saved_CFLAGS"
-if test "$ac_cv_c_no_dse_support" = "yes"
-then
-  CFLAGS="$CFLAGS -fno-dse"
-fi
-
  if false; then
   SOUND_OSS_TRUE=
   SOUND_OSS_FALSE='#'
diff --git a/configure.ac b/configure.ac
index 9c1b8124..bd43c43d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,24 +36,13 @@ AC_SUBST(GLADE2_LIBS)
 
 AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in])
 
-dnl Check for -fno-dse option support
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -fno-dse"
-AC_CACHE_CHECK([for -fno-dse option support], ac_cv_c_no_dse_support,
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>]], [[]])],[ac_cv_c_no_dse_support=yes],[ac_cv_c_no_dse_support=no]))
-CFLAGS="$saved_CFLAGS"
-if test "$ac_cv_c_no_dse_support" = "yes"
-then
-  CFLAGS="$CFLAGS -fno-dse"
-fi
-
 AM_CONDITIONAL(SOUND_OSS, false)
 AM_CONDITIONAL(SOUND_SDL, false)
 AM_CONDITIONAL(SOUND_NULL, false)
 
 dnl Check for ALSA 1.x, OSS, or PulseAudio
 
-AC_ARG_ENABLE(sound, [  --enable-sound=...      force selection of sound backend (alsa, null, oss, pulseaudio, sdl) (default: sdl)],
+AC_ARG_ENABLE(sound, [  --enable-sound=...      force selection of sound backend (alsa/null/oss/pulseaudio/sdl) (default: sdl)],
 [ SOUND="$enableval" ],[ SOUND="sdl" ])
 
 if test "x$SOUND" = xalsa; then
@@ -138,7 +127,7 @@ AM_CONDITIONAL(ARCH_X86, false)
 AM_CONDITIONAL(ARCH_X86_64, false)
 AM_CONDITIONAL(ARCH_PPC, false)
 
-AC_ARG_ENABLE(dynarec, [  --enable-dynarec=...    force selection of dynamic recompiler platform (x86, x86_64, ppc) (default: autodetect)],
+AC_ARG_ENABLE(dynarec, [  --enable-dynarec=...    force selection of dynamic recompiler platform (auto/no/x86/x86_64/ppc) (default: auto)],
 [ DYNAREC="$enableval" ],[ DYNAREC="auto" ])
 
 if test "x$DYNAREC" = xauto; then
diff --git a/libpcsxcore/psxcommon.c b/libpcsxcore/psxcommon.c
index 5be8f4d2..a173eceb 100644
--- a/libpcsxcore/psxcommon.c
+++ b/libpcsxcore/psxcommon.c
@@ -51,7 +51,10 @@ void EmuShutdown() {
 }
 
 void EmuUpdate() {
-	SysUpdate();
+	// Do not allow hotkeys inside a softcall from HLE BIOS
+	if (!Config.HLE || psxRegs.GPR.n.ra != 0x80001000)
+		SysUpdate();
+
 	ApplyCheats();
 }