X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fbreakpoint.c;h=7892dc1f23a561abff788a897caf5d30ad0e97d4;hb=085501b44cc1cbdd9e260139d30b383372ddd1b8;hp=9b7b31845c0709f5c35ea9d7ce689d34bb12c777;hpb=b66385e2031fc2cac17dd129df0af400beb48a22;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 9b7b318..7892dc1 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -124,7 +124,7 @@ static long compute_offset(os_context_t *context, lispobj code)
     }
 }
 
-void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
+void handle_breakpoint(os_context_t *context)
 {
     lispobj code, context_sap;
 
@@ -147,8 +147,7 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
     undo_fake_foreign_function_call(context);
 }
 
-void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
-                                os_context_t *context)
+void *handle_fun_end_breakpoint(os_context_t *context)
 {
     lispobj code, context_sap, lra;
     struct code *codeptr;
@@ -189,12 +188,22 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
 void
 handle_single_step_trap (os_context_t *context, int kind, int register_offset)
 {
+    lispobj context_sap;
+
+    /* Allocate the SAP object while the interrupts are still
+     * disabled. */
+    context_sap = alloc_sap(context);
+
     fake_foreign_function_call(context);
 
+#ifndef LISP_FEATURE_WIN32
+    thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
+
     funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP),
-             alloc_sap(context),
+             context_sap,
              make_fixnum(kind),
              make_fixnum(register_offset));
 
-    undo_fake_foreign_function_call(context);
+    undo_fake_foreign_function_call(context); /* blocks signals again */
 }