2005-10-29 Zoltan Varga <vargaz@freemail.hu>

	* mini-amd64.c (mono_arch_compute_omit_fp): Move the check for the
	debugger to the proper place.

svn path=/trunk/mono/; revision=52380

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 0b2e638a88461575b55fd4abfcda3442b30c0e33..1b36bad373ec295b50a825a1eae5d01c7d6bc272 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-29  Zoltan Varga  <vargaz@freemail.hu>
+
+       * mini-amd64.c (mono_arch_compute_omit_fp): Move the check for the
+       debugger to the proper place.
+
 2005-10-29  Martin Baulig  <martin@ximian.com>
 
        * mini-amd64.c (debug_omit_fp): Temporarily disable fp elimination

diff --git a/mono/mini/mini-amd64.c b/mono/mini/mini-amd64.c
index 3376076ae264962ba3b17892db4c79ba19e530e1..43a658133b61c7c48d6c761911960f07a665c32f 100644 (file)
--- a/mono/mini/mini-amd64.c
+++ b/mono/mini/mini-amd64.c
@@ -18,6 +18,7 @@
 #include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/threads.h>
 #include <mono/metadata/profiler-private.h>
+#include <mono/metadata/mono-debug.h>
 #include <mono/utils/mono-math.h>
 
 #include "trace.h"
@@ -135,12 +136,7 @@ debug_omit_fp (void)
 #if 0
        return debug_count ();
 #else
-       /* Temporarily disable this when running in the debugger until we have support
-        * for this in the debugger. */
-       if (mono_debug_using_mono_debugger ())
-               return FALSE;
-       else
-               return TRUE;
+       return TRUE;
 #endif
 }
 
@@ -813,9 +809,13 @@ mono_arch_compute_omit_fp (MonoCompile *cfg)
        cfg->arch.omit_fp = TRUE;
        cfg->arch.omit_fp_computed = TRUE;
 
-       if (!debug_omit_fp ())
+       /* Temporarily disable this when running in the debugger until we have support
+        * for this in the debugger. */
+       if (mono_debug_using_mono_debugger ())
                cfg->arch.omit_fp = FALSE;
 
+       if (!debug_omit_fp ())
+               cfg->arch.omit_fp = FALSE;
        if (cfg->method->save_lmf)
                cfg->arch.omit_fp = FALSE;
        if (cfg->flags & MONO_CFG_HAS_ALLOCA)