X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fmini-darwin.c;h=aca60d498f487a1cd60bd8c6fada8741d10ebff4;hb=HEAD;hp=309ebd82531bf937c0f302cc1955da251b7f8435;hpb=12461baf50da00c5d30f757af0e1891d7ebbef3b;p=mono.git diff --git a/mono/mini/mini-darwin.c b/mono/mini/mini-darwin.c index 309ebd82531..aca60d498f4 100644 --- a/mono/mini/mini-darwin.c +++ b/mono/mini/mini-darwin.c @@ -1,5 +1,6 @@ -/* - * mini-darwin.c: Darwin/MacOS support for Mono. +/** + * \file + * Darwin/MacOS support for Mono. * * Authors: * Mono Team (mono-list@lists.ximian.com) @@ -8,7 +9,7 @@ * Copyright 2003-2011 Novell, Inc (http://www.novell.com) * Copyright 2011 Xamarin, Inc (http://www.xamarin.com) * - * See LICENSE for licensing information. + * Licensed under the MIT license. See LICENSE file in the project root for full license information. */ #include #include @@ -33,8 +34,6 @@ #include #include #include -#include -#include "mono/metadata/profiler.h" #include #include #include @@ -44,11 +43,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include @@ -69,144 +68,6 @@ #include #include -#if defined (TARGET_OSX) && (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5) -#define NEEDS_EXCEPTION_THREAD -#endif - -#ifdef NEEDS_EXCEPTION_THREAD - -/* - * This code disables the CrashReporter of MacOS X by installing - * a dummy Mach exception handler. - */ - -/* - * http://darwinsource.opendarwin.org/10.4.3/xnu-792.6.22/osfmk/man/exc_server.html - */ -extern boolean_t exc_server (mach_msg_header_t *request_msg, mach_msg_header_t *reply_msg); - -/* - * The exception message - */ -typedef struct { - mach_msg_base_t msg; /* common mach message header */ - char payload [1024]; /* opaque */ -} mach_exception_msg_t; - -/* The exception port */ -static mach_port_t mach_exception_port = VM_MAP_NULL; - -kern_return_t -catch_exception_raise ( - mach_port_t exception_port, - mach_port_t thread, - mach_port_t task, - exception_type_t exception, - exception_data_t code, - mach_msg_type_number_t code_count); - -/* - * Implicitly called by exc_server. Must be public. - * - * http://darwinsource.opendarwin.org/10.4.3/xnu-792.6.22/osfmk/man/catch_exception_raise.html - */ -kern_return_t -catch_exception_raise ( - mach_port_t exception_port, - mach_port_t thread, - mach_port_t task, - exception_type_t exception, - exception_data_t code, - mach_msg_type_number_t code_count) -{ - /* consume the exception */ - return KERN_FAILURE; -} - -/* - * Exception thread handler. - */ -static -void * -mach_exception_thread (void *arg) -{ - for (;;) { - mach_exception_msg_t request; - mach_exception_msg_t reply; - mach_msg_return_t result; - - /* receive from "mach_exception_port" */ - result = mach_msg (&request.msg.header, - MACH_RCV_MSG | MACH_RCV_LARGE, - 0, - sizeof (request), - mach_exception_port, - MACH_MSG_TIMEOUT_NONE, - MACH_PORT_NULL); - - g_assert (result == MACH_MSG_SUCCESS); - - /* dispatch to catch_exception_raise () */ - exc_server (&request.msg.header, &reply.msg.header); - - /* send back to sender */ - result = mach_msg (&reply.msg.header, - MACH_SEND_MSG, - reply.msg.header.msgh_size, - 0, - MACH_PORT_NULL, - MACH_MSG_TIMEOUT_NONE, - MACH_PORT_NULL); - - /* - If we try to abort the thread while delivering an exception. The port will be gone since the kernel - setup a send once port to deliver the resume message and thread_abort will consume it. - */ - g_assert (result == MACH_MSG_SUCCESS || result == MACH_SEND_INVALID_DEST); - } - return NULL; -} - -static void -macosx_register_exception_handler (void) -{ - mach_port_t task; - pthread_attr_t attr; - pthread_t thread; - - if (mach_exception_port != VM_MAP_NULL) - return; - - task = mach_task_self (); - - /* create the "mach_exception_port" with send & receive rights */ - g_assert (mach_port_allocate (task, MACH_PORT_RIGHT_RECEIVE, - &mach_exception_port) == KERN_SUCCESS); - g_assert (mach_port_insert_right (task, mach_exception_port, mach_exception_port, - MACH_MSG_TYPE_MAKE_SEND) == KERN_SUCCESS); - - /* create the exception handler thread */ - g_assert (!pthread_attr_init (&attr)); - g_assert (!pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED)); - g_assert (!pthread_create (&thread, &attr, mach_exception_thread, NULL)); - pthread_attr_destroy (&attr); - - /* - * register "mach_exception_port" as a receiver for the - * EXC_BAD_ACCESS exception - * - * http://darwinsource.opendarwin.org/10.4.3/xnu-792.6.22/osfmk/man/task_set_exception_ports.html - */ - g_assert (task_set_exception_ports (task, EXC_MASK_BAD_ACCESS, - mach_exception_port, - EXCEPTION_DEFAULT, - MACHINE_THREAD_STATE) == KERN_SUCCESS); - - mono_gc_register_mach_exception_thread (thread); -} - -#endif - /* This is #define'd by Boehm GC to _GC_dlopen. */ #undef dlopen @@ -215,9 +76,6 @@ void* dlopen(const char* path, int mode); void mono_runtime_install_handlers (void) { -#ifdef NEEDS_EXCEPTION_THREAD - macosx_register_exception_handler (); -#endif mono_runtime_posix_install_handlers (); /* Snow Leopard has a horrible bug: http://openradar.appspot.com/7209349 @@ -236,81 +94,12 @@ mono_runtime_install_handlers (void) #endif } -pid_t -mono_runtime_syscall_fork () -{ -#ifdef HAVE_FORK - return (pid_t) fork (); -#else - g_assert_not_reached (); -#endif -} - -void -mono_gdb_render_native_backtraces (pid_t crashed_pid) -{ -#ifdef HAVE_EXECV - const char *argv [5]; - char template [] = "/tmp/mono-gdb-commands.XXXXXX"; - FILE *commands; - gboolean using_lldb = FALSE; - - using_lldb = TRUE; - - argv [0] = g_find_program_in_path ("gdb"); - if (argv [0]) - using_lldb = FALSE; - - if (using_lldb) - argv [0] = g_find_program_in_path ("lldb"); - - if (argv [0] == NULL) - return; - - if (mkstemp (template) == -1) - return; - - commands = fopen (template, "w"); - if (using_lldb) { - fprintf (commands, "process attach --pid %ld\n", (long) crashed_pid); - fprintf (commands, "thread list\n"); - fprintf (commands, "thread backtrace all\n"); - fprintf (commands, "detach\n"); - fprintf (commands, "quit\n"); - argv [1] = "--source"; - argv [2] = template; - argv [3] = 0; - - } else { - fprintf (commands, "attach %ld\n", (long) crashed_pid); - fprintf (commands, "info threads\n"); - fprintf (commands, " t a a info thread\n"); - fprintf (commands, "thread apply all bt\n"); - argv [1] = "-batch"; - argv [2] = "-x"; - argv [3] = template; - argv [4] = 0; - } - fflush (commands); - fclose (commands); - - fclose (stdin); - - execv (argv [0], (char**)argv); - unlink (template); -#else - fprintf (stderr, "mono_gdb_render_native_backtraces not supported on this platform\n"); -#endif // HAVE_EXECV -} - gboolean mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo *info) { kern_return_t ret; - mach_msg_type_number_t num_state; - thread_state_t state; - ucontext_t ctx; - mcontext_t mctx; + mach_msg_type_number_t num_state, num_fpstate; + thread_state_t state, fpstate; MonoJitTlsData *jit_tls; void *domain; MonoLMF *lmf = NULL; @@ -324,16 +113,15 @@ mono_thread_state_init_from_handle (MonoThreadUnwindState *tctx, MonoThreadInfo tctx->unwind_data [MONO_UNWIND_DATA_JIT_TLS] = NULL; state = (thread_state_t) alloca (mono_mach_arch_get_thread_state_size ()); - mctx = (mcontext_t) alloca (mono_mach_arch_get_mcontext_size ()); + fpstate = (thread_state_t) alloca (mono_mach_arch_get_thread_fpstate_size ()); - ret = mono_mach_arch_get_thread_state (info->native_handle, state, &num_state); + do { + ret = mono_mach_arch_get_thread_states (info->native_handle, state, &num_state, fpstate, &num_fpstate); + } while (ret == KERN_ABORTED); if (ret != KERN_SUCCESS) return FALSE; - mono_mach_arch_thread_state_to_mcontext (state, mctx); - ctx.uc_mcontext = mctx; - - mono_sigctx_to_monoctx (&ctx, &tctx->ctx); + mono_mach_arch_thread_states_to_mono_context (state, fpstate, &tctx->ctx); /* mono_set_jit_tls () sets this */ jit_tls = mono_thread_info_tls_get (info, TLS_KEY_JIT_TLS);