X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-darwin-os.c;h=1cc837c02e7ecc1bd147636677c635fd06de148b;hb=4bf2de6a2adff75459cf218c8bff67f6cdb91211;hp=3c32ec41d8638557d9ad7344a250d41a2d7c7f2c;hpb=e5d96999ae4388181ddb0c113313f26afbe997e8;p=sbcl.git diff --git a/src/runtime/x86-darwin-os.c b/src/runtime/x86-darwin-os.c index 3c32ec4..1cc837c 100644 --- a/src/runtime/x86-darwin-os.c +++ b/src/runtime/x86-darwin-os.c @@ -1,5 +1,3 @@ - - #ifdef LISP_FEATURE_SB_THREAD #include #include @@ -25,6 +23,7 @@ #include #include #include +#include #ifdef LISP_FEATURE_SB_THREAD @@ -116,9 +115,10 @@ int arch_os_thread_cleanup(struct thread *thread) { #ifdef LISP_FEATURE_MACH_EXCEPTION_HANDLER -void sigill_handler(int signal, siginfo_t *siginfo, void *void_context); -void sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context); -void memory_fault_handler(int signal, siginfo_t *siginfo, void *void_context); +void sigill_handler(int signal, siginfo_t *siginfo, os_context_t *context); +void sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context); +void memory_fault_handler(int signal, siginfo_t *siginfo, + os_context_t *context); /* exc_server handles mach exception messages from the kernel and * calls catch exception raise. We use the system-provided @@ -371,8 +371,8 @@ void dump_context(x86_thread_state32_t *thread_state) #endif void -control_stack_exhausted_handler(int signal, siginfo_t *siginfo, void *void_context) { - os_context_t *context = arch_os_get_context(&void_context); +control_stack_exhausted_handler(int signal, siginfo_t *siginfo, + os_context_t *context) { unblock_signals_in_context_and_maybe_warn(context); arrange_return_to_lisp_function @@ -380,9 +380,7 @@ control_stack_exhausted_handler(int signal, siginfo_t *siginfo, void *void_conte } void -undefined_alien_handler(int signal, siginfo_t *siginfo, void *void_context) { - os_context_t *context = arch_os_get_context(&void_context); - +undefined_alien_handler(int signal, siginfo_t *siginfo, os_context_t *context) { arrange_return_to_lisp_function (context, StaticSymbolFunction(UNDEFINED_ALIEN_VARIABLE_ERROR)); }