1.0.12.6: Removing UNIX-NAMESTRING, part 1

[sbcl.git] / src / runtime / interrupt.c

diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c
index d9a9301..eed61e0 100644 (file)
--- 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) {
 
@@ -776,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
@@ -1191,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
@@ -1295,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.
     */