#include <dlfcn.h>
#include <AvailabilityMacros.h>
-#if (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5) && !defined (TARGET_ARM)
+#if defined (TARGET_OSX) && (MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5)
#define NEEDS_EXCEPTION_THREAD
#endif
/* 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.
*
}
static void
-macosx_register_exception_handler ()
+macosx_register_exception_handler (void)
{
mach_port_t task;
pthread_attr_t attr;
/* This is #define'd by Boehm GC to _GC_dlopen. */
#undef dlopen
+void* dlopen(const char* path, int mode);
+
void
mono_runtime_install_handlers (void)
{
mono_sigctx_to_monoctx (&ctx, &tctx->ctx);
- domain_key = mono_domain_get_tls_offset ();
+ domain_key = mono_domain_get_tls_key ();
jit_key = mono_get_jit_tls_key ();
jit_tls = mono_mach_arch_get_tls_value_from_thread (thread_id, jit_key);
domain = mono_mach_arch_get_tls_value_from_thread (thread_id, domain_key);
/*Thread already started to cleanup, can no longer capture unwind state*/
- if (!jit_tls)
+ if (!jit_tls || !domain)
return FALSE;
- g_assert (domain);
#if defined (MONO_ARCH_ENABLE_MONO_LMF_VAR)
lmf_key = mono_get_lmf_tls_offset ();