Introduce MonoThreadUnwindState and a bunch overloads to mono_walk_stack.

[mono.git] / mono / mini / mini-darwin.c

diff --git a/mono/mini/mini-darwin.c b/mono/mini/mini-darwin.c
index 0b2ff12e7c63428599468f43101720491e956bcb..7880c82ae615d67bc3741142e54cf7777640ac50 100644 (file)
--- a/mono/mini/mini-darwin.c
+++ b/mono/mini/mini-darwin.c
@@ -43,6 +43,7 @@
 #include <mono/metadata/verify-internals.h>
 #include <mono/metadata/mempool-internals.h>
 #include <mono/metadata/attach.h>
+#include <mono/metadata/gc-internal.h>
 #include <mono/utils/mono-math.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-counters.h>
@@ -65,6 +66,7 @@
 #include <mach/task.h>
 #include <pthread.h>
 #include <dlfcn.h>
+#include <AvailabilityMacros.h>
 
 /*
  * This code disables the CrashReporter of MacOS X by installing
@@ -179,12 +181,19 @@ macosx_register_exception_handler ()
                                            mach_exception_port,
                                            EXCEPTION_DEFAULT,
                                            MACHINE_THREAD_STATE) == KERN_SUCCESS);
+
+       mono_gc_register_mach_exception_thread (thread);
 }
 
+/* This is #define'd by Boehm GC to _GC_dlopen. */
+#undef dlopen
+
 void
 mono_runtime_install_handlers (void)
 {
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5
        macosx_register_exception_handler ();
+#endif
        mono_runtime_posix_install_handlers ();
 
        /* Snow Leopard has a horrible bug: http://openradar.appspot.com/7209349
@@ -206,34 +215,7 @@ mono_runtime_install_handlers (void)
 pid_t
 mono_runtime_syscall_fork ()
 {
-#if defined(__i386__)
-       /* Apple's fork syscall returns a regpair in EAX:EDX.
-        *  EAX == pid of caller always
-        *  EDX == 0 for parent, 1 for child
-        */             
-       register_t eax;
-       register_t edx;
-       pid_t pid;
-
-       __asm__  __volatile__ (
-               "mov $0x2, %%eax;"
-               "int $0x80;"
-               "mov %%eax, %0;"
-               "mov %%edx, %1;"
-               : "=m" (eax), "=m" (edx));
-
-       if (edx == 0) {
-               pid = eax;
-       } else if (edx == 1) {
-               pid = 0;
-       } else {
-               g_assert_not_reached ();
-       }
-
-       return pid;
-#else
-       g_assert_not_reached ();
-#endif
+       return (pid_t) fork ();
 }
 
 gboolean