From a693929dadedf8061e3f70ad033b142a9390047b Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sat, 29 Oct 2005 17:28:04 +0000 Subject: [PATCH] 2005-10-29 Zoltan Varga * mini-amd64.c (mono_arch_compute_omit_fp): Move the check for the debugger to the proper place. svn path=/trunk/mono/; revision=52380 --- mono/mini/ChangeLog | 5 +++++ mono/mini/mini-amd64.c | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 0b2e638a884..1b36bad373e 100644 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,8 @@ +2005-10-29 Zoltan Varga + + * mini-amd64.c (mono_arch_compute_omit_fp): Move the check for the + debugger to the proper place. + 2005-10-29 Martin Baulig * 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 3376076ae26..43a658133b6 100644 --- a/mono/mini/mini-amd64.c +++ b/mono/mini/mini-amd64.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #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) -- 2.25.1