X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=libgc%2Fdarwin_stop_world.c;h=9904a3e1d0f17cb8e63f0f0aafaf9e1919f37fd2;hb=c16b1270273e1dd7bf9870983327414dc4c1c52b;hp=7e60fe790f53931eb85e99611c71f86a0a02757a;hpb=2469f3b3283f07c86839f9116859a66b37850f0b;p=mono.git

diff --git a/libgc/darwin_stop_world.c b/libgc/darwin_stop_world.c
index 7e60fe790f5..9904a3e1d0f 100644
--- a/libgc/darwin_stop_world.c
+++ b/libgc/darwin_stop_world.c
@@ -5,10 +5,6 @@
 #include <AvailabilityMacros.h>
 #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
@@ -79,7 +75,7 @@ void GC_push_all_stacks() {
   kern_return_t r;
   GC_thread p;
   pthread_t me;
-  ptr_t lo, hi;
+  ptr_t lo, hi, altstack_lo, altstack_hi;
 #if defined(POWERPC)
   ppc_thread_state_t state;
   mach_msg_type_number_t thread_state_count = PPC_THREAD_STATE_COUNT;
@@ -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;
 
@@ -146,7 +142,6 @@ void GC_push_all_stacks() {
           GC_push_one(state.__rdi);
           GC_push_one(state.__rsi);
           GC_push_one(state.__rbp);
-          GC_push_one(state.__rsp);
           GC_push_one(state.__r8);
           GC_push_one(state.__r9);
           GC_push_one(state.__r10);
@@ -155,13 +150,8 @@ void GC_push_all_stacks() {
           GC_push_one(state.__r13);
           GC_push_one(state.__r14);
           GC_push_one(state.__r15);
-          GC_push_one(state.__rip);
-          GC_push_one(state.__rflags);
-          GC_push_one(state.__cs);
-          GC_push_one(state.__fs);
-          GC_push_one(state.__gs);
 #elif defined(POWERPC)
-#if defined(_STRUCT_PPC_EXCEPTION_STATE)
+#if defined(_STRUCT_PPC_EXCEPTION_STATE) && defined(__DARWIN_UNIX03)
 	lo = (void*)(state.__r1 - PPC_RED_ZONE_SIZE);
         
 	GC_push_one(state.__r0); 
@@ -258,6 +248,16 @@ void GC_push_all_stacks() {
 	hi = GC_stackbottom;
       else
 	hi = p->stack_end;
+
+	  if (p->altstack && lo >= p->altstack && lo <= p->altstack + p->altstack_size) {
+		  altstack_lo = lo;
+		  altstack_hi = p->altstack + p->altstack_size;
+		  lo = (char*)p->stack;
+		  hi = (char*)p->stack + p->stack_size;
+	  }	else {
+		  altstack_lo = NULL;
+	  }
+
 #if DEBUG_THREADS
       GC_printf3("Darwin: Stack for thread 0x%lx = [%lx,%lx)\n",
 		 (unsigned long) p -> id,
@@ -265,7 +265,10 @@ void GC_push_all_stacks() {
 		 (unsigned long) hi
 		 );
 #endif
-      GC_push_all_stack(lo,hi);
+	  if (lo)
+		  GC_push_all_stack(lo,hi);
+	  if (altstack_lo)
+		  GC_push_all_stack(altstack_lo,altstack_hi);
     } /* for(p=GC_threads[i]...) */
   } /* for(i=0;i<THREAD_TABLE_SZ...) */
 }
@@ -384,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);
 
@@ -575,6 +578,10 @@ void GC_stop_world()
     thread_act_array_t act_list, prev_list;
     mach_msg_type_number_t listcount, prevcount;
     
+    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());
 #   endif
@@ -645,6 +652,9 @@ void GC_stop_world()
     #endif
 	  
 	  mach_port_deallocate(my_task, my_thread);
+
+    if (GC_notify_event)
+        GC_notify_event (GC_EVENT_POST_STOP_WORLD);
 }
 
 /* Caller holds allocation lock, and has held it continuously since	*/
@@ -660,6 +670,9 @@ void GC_start_world()
   mach_msg_type_number_t listcount;
   struct thread_basic_info info;
   mach_msg_type_number_t outCount = THREAD_INFO_MAX;
+
+  if (GC_notify_event)
+      GC_notify_event (GC_EVENT_PRE_START_WORLD);
   
 #   if DEBUG_THREADS
       GC_printf0("World starting\n");
@@ -706,6 +719,10 @@ void GC_start_world()
     vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
 	
 	mach_port_deallocate(my_task, my_thread);
+
+    if (GC_notify_event)
+        GC_notify_event (GC_EVENT_POST_START_WORLD);
+
 #   if DEBUG_THREADS
      GC_printf0("World started\n");
 #   endif
@@ -716,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