X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=eed61e06086fbf753303bb478d12b449ee83a19f;hb=2529c316d05494f2bcdeccf98c3a6298ecd08d7d;hp=3597ee193b1969f921a2eed0a809ca8b940f5bf6;hpb=4023b1bec2412344e5eea4a33cd85dd662149c67;p=sbcl.git diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 3597ee1..eed61e0 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -276,7 +276,7 @@ fake_foreign_function_call(os_context_t *context) (lispobj *)(unsigned long) (*os_context_register_addr(context, reg_ALLOC)); /* fprintf(stderr,"dynamic_space_free_pointer: %p\n", dynamic_space_free_pointer); */ -#if defined(LISP_FEATURE_ALPHA) +#if defined(LISP_FEATURE_ALPHA) || defined(LISP_FEATURE_MIPS) if ((long)dynamic_space_free_pointer & 1) { lose("dead in fake_foreign_function_call, context = %x\n", context); } @@ -442,7 +442,7 @@ interrupt_handle_pending(os_context_t *context) * that had to be executed or because pseudo atomic triggered * twice for a single interrupt. For the interested reader, * that may happen if an interrupt hits after the interrupted - * flag is cleared but before pseduo-atomic is set and a + * flag is cleared but before pseudo-atomic is set and a * pseudo atomic is interrupted in that interrupt. */ if (data->pending_handler) { @@ -597,7 +597,8 @@ interrupt_handle_now(int signal, siginfo_t *info, os_context_t *context) * already; we're just doing the Lisp-level processing now that we * put off then */ static void -run_deferred_handler(struct interrupt_data *data, void *v_context) { +run_deferred_handler(struct interrupt_data *data, void *v_context) +{ /* The pending_handler may enable interrupts and then another * interrupt may hit, overwrite interrupt_data, so reset the * pending handler before calling it. Trust the handler to finish @@ -775,10 +776,11 @@ sig_stop_for_gc_handler(int signal, siginfo_t *info, void *void_context) thread->state=STATE_SUSPENDED; FSHOW_SIGNAL((stderr,"thread=%lu suspended\n",thread->os_thread)); + sigemptyset(&ss); #if defined(SIG_RESUME_FROM_GC) - sigemptyset(&ss); sigaddset(&ss,SIG_RESUME_FROM_GC); + sigaddset(&ss,SIG_RESUME_FROM_GC); #else - sigemptyset(&ss); sigaddset(&ss,SIG_STOP_FOR_GC); + sigaddset(&ss,SIG_STOP_FOR_GC); #endif /* It is possible to get SIGCONT (and probably other non-blockable @@ -1023,7 +1025,8 @@ interrupt_thread_handler(int num, siginfo_t *info, void *v_context) * functions and variables. */ void -undefined_alien_function() { +undefined_alien_function(void) +{ funcall0(SymbolFunction(UNDEFINED_ALIEN_FUNCTION_ERROR)); } @@ -1112,7 +1115,7 @@ sigaction_nodefer_test_handler(int signal, siginfo_t *info, void *void_context) } static void -see_if_sigaction_nodefer_works() +see_if_sigaction_nodefer_works(void) { struct sigaction sa, old_sa; @@ -1189,9 +1192,6 @@ undoably_install_low_level_interrupt_handler (int signal, | (sigaction_nodefer_works ? SA_NODEFER : 0); #ifdef LISP_FEATURE_C_STACK_IS_CONTROL_STACK if((signal==SIG_MEMORY_FAULT) -#ifdef SIG_MEMORY_FAULT2 - || (signal==SIG_MEMORY_FAULT2) -#endif #ifdef SIG_INTERRUPT_THREAD || (signal==SIG_INTERRUPT_THREAD) #endif @@ -1255,7 +1255,7 @@ install_handler(int signal, void handler(int, siginfo_t*, void*)) } void -interrupt_init() +interrupt_init(void) { #ifndef LISP_FEATURE_WIN32 int i; @@ -1293,7 +1293,7 @@ void lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr) { /* FIXME: This is lossy: if we get another memory fault (eg. from - * another thread) before lisp has read this, we the information. + * another thread) before lisp has read this, we lose the information. * However, since this is mostly informative, we'll live with that for * now -- some address is better then no address in this case. */ @@ -1302,7 +1302,7 @@ lisp_memory_fault_error(os_context_t *context, os_vm_address_t addr) } #endif -void +static void unhandled_trap_error(os_context_t *context) { lispobj context_sap; @@ -1315,7 +1315,7 @@ unhandled_trap_error(os_context_t *context) lose("UNHANDLED-TRAP-ERROR fell through"); } -/* Common logic far trapping instructions. How we actually handle each +/* Common logic for trapping instructions. How we actually handle each * case is highly architecture dependent, but the overall shape is * this. */ void