X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterrupt.c;h=467a2e4431cefab9fc412c8d5e12845f15fbdf6a;hb=7f0f521aa3f6b45259c5dfd5f7f11adcd1a7cac6;hp=61eca7870bbb47761008527705eb1d9b19f12fd4;hpb=d45e8a2e9167150c8283783152d2449bd8d59d2d;p=sbcl.git

diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c
index 61eca78..467a2e4 100644
--- a/src/runtime/interrupt.c
+++ b/src/runtime/interrupt.c
@@ -14,13 +14,9 @@
  */
 
 #include <stdio.h>
-
+#include <stdlib.h>
+#include <string.h>
 #include <signal.h>
-#ifdef mach /* KLUDGE: #ifdef on lowercase symbols? Ick. -- WHN 19990904 */
-#ifdef mips
-#include <mips/cpu.h>
-#endif
-#endif
 
 #include "runtime.h"
 #include "arch.h"
@@ -44,6 +40,7 @@ void sigaddset_blockable(sigset_t *s)
     sigaddset(s, SIGPIPE);
     sigaddset(s, SIGALRM);
     sigaddset(s, SIGURG);
+    sigaddset(s, SIGFPE);
     sigaddset(s, SIGTSTP);
     sigaddset(s, SIGCHLD);
     sigaddset(s, SIGIO);
@@ -139,8 +136,8 @@ fake_foreign_function_call(os_context_t *context)
 	== current_control_frame_pointer) {
         /* There is a small window during call where the callee's
          * frame isn't built yet. */
-        if (LowtagOf(*os_context_register_addr(context, reg_CODE))
-	    == type_FunctionPointer) {
+        if (lowtag_of(*os_context_register_addr(context, reg_CODE))
+	    == FUN_POINTER_LOWTAG) {
             /* We have called, but not built the new frame, so
              * build it for them. */
             current_control_frame_pointer[0] =
@@ -213,6 +210,7 @@ undo_fake_foreign_function_call(os_context_t *context)
      * FREE_INTERRUPT_CONTEXT_INDEX? If so, we should say so. And
      * perhaps yes, unbind_to_here() really would be clearer and less
      * fragile.. */
+    /* dan (2001.08.10) thinks the above supposition is probably correct */
     unbind();
 
 #ifdef reg_ALLOC
@@ -319,7 +317,10 @@ interrupt_handle_pending(os_context_t *context)
      * anyway. Why we still need to copy the pending_mask into the
      * context given that we're now done with the context anyway, I
      * couldn't say. */
-    memcpy(os_context_sigmask_addr(context), &pending_mask, sizeof(sigset_t));
+#if 0
+    memcpy(os_context_sigmask_addr(context), &pending_mask, 
+	   4 /* sizeof(sigset_t) */ );
+#endif
     sigemptyset(&pending_mask);
     if (pending_signal) {
 	int signal = pending_signal;
@@ -367,7 +368,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context)
     if (ARE_SAME_HANDLER(handler.c, SIG_IGN)) {
 	return;
     }
-
+    
 #ifndef __i386__
     were_in_lisp = !foreign_function_call_active;
     if (were_in_lisp)
@@ -389,7 +390,7 @@ interrupt_handle_now(int signal, siginfo_t *info, void *void_context)
 	 * support decides to pass on it. */
 	lose("no handler for signal %d in interrupt_handle_now(..)", signal);
 
-    } else if (LowtagOf(handler.lisp) == type_FunctionPointer) {
+    } else if (lowtag_of(handler.lisp) == FUN_POINTER_LOWTAG) {
 
         /* Allocate the SAPs while the interrupts are still disabled.
 	 * (FIXME: Why? This is the way it was done in CMU CL, and it
@@ -624,12 +625,13 @@ undoably_install_low_level_interrupt_handler (int signal,
     sigaddset_blockable(&sa.sa_mask);
     sa.sa_flags = SA_SIGINFO | SA_RESTART;
 
-    /* In the case of interrupt handlers which are modified
-     * more than once, we only save the original unmodified
-     * copy. */
+    /* In the case of interrupt handlers which are modified more than
+     * once, we only save the original unmodified copy. */
     if (!old_low_level_signal_handler_state->was_modified) {
+	struct sigaction *old_handler =
+	    (struct sigaction*) &old_low_level_signal_handler_state->handler;
 	old_low_level_signal_handler_state->was_modified = 1;
-	sigaction(signal, &sa, &old_low_level_signal_handler_state->handler);
+	sigaction(signal, &sa, old_handler);
     } else {
 	sigaction(signal, &sa, NULL);
     }