X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=libgc%2Fdarwin_stop_world.c;h=9904a3e1d0f17cb8e63f0f0aafaf9e1919f37fd2;hb=813c1308fe53d16b419d22777f4d1124f06e7c9e;hp=a1051f5ac4e0e80b1af6af6198d78fa799907766;hpb=2e928fd71847cd250431d0d776457eae9816ae5a;p=mono.git diff --git a/libgc/darwin_stop_world.c b/libgc/darwin_stop_world.c index a1051f5ac4e..9904a3e1d0f 100644 --- a/libgc/darwin_stop_world.c +++ b/libgc/darwin_stop_world.c @@ -5,10 +5,6 @@ #include #include "mono/utils/mono-compiler.h" -#ifdef MONO_DEBUGGER_SUPPORTED -#include "include/libgc-mono-debugger.h" -#endif - /* From "Inside Mac OS X - Mach-O Runtime Architecture" published by Apple Page 49: "The space beneath the stack pointer, where a new stack frame would normally @@ -115,7 +111,7 @@ void GC_push_all_stacks() { if(r != KERN_SUCCESS) continue; #if defined(I386) -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +#if defined (TARGET_IOS) || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) lo = state.__esp; @@ -391,7 +387,7 @@ void GC_push_all_stacks() { (natural_t *)&info, &outCount); if(r != KERN_SUCCESS) continue; -#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 +#if defined (TARGET_IOS) || (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) lo = (void*)info.__esp; hi = (ptr_t)FindTopOfStack(info.__esp); @@ -584,6 +580,7 @@ void GC_stop_world() if (GC_notify_event) GC_notify_event (GC_EVENT_PRE_STOP_WORLD); + GC_process_togglerefs (); # if DEBUG_THREADS GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self()); @@ -736,17 +733,4 @@ void GC_darwin_register_mach_handler_thread(mach_port_t thread) { GC_use_mach_handler_thread = 1; } -#ifdef MONO_DEBUGGER_SUPPORTED -GCThreadFunctions *gc_thread_vtable = NULL; - -void * -GC_mono_debugger_get_stack_ptr (void) -{ - GC_thread me; - - me = GC_lookup_thread (pthread_self ()); - return &me->stop_info.stack_ptr; -} -#endif - #endif