X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=846fa777c1e1e15a4606f1e30d26c09b5b72baca;hb=8a632c14b592472873cfb214239c9387bc1a1ced;hp=9b7b31845c0709f5c35ea9d7ce689d34bb12c777;hpb=b66385e2031fc2cac17dd129df0af400beb48a22;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 9b7b318..846fa77 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;
 
@@ -139,7 +139,7 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
     thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
 #endif
 
-    funcall3(SymbolFunction(HANDLE_BREAKPOINT),
+    funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
              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;
@@ -165,7 +164,7 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
 #endif
 
-    funcall3(SymbolFunction(HANDLE_BREAKPOINT),
+    funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
              code,
              context_sap);
@@ -191,10 +190,13 @@ handle_single_step_trap (os_context_t *context, int kind, int register_offset)
 {
     fake_foreign_function_call(context);
 
-    funcall3(SymbolFunction(HANDLE_SINGLE_STEP_TRAP),
-             alloc_sap(context),
+#ifndef LISP_FEATURE_WIN32
+    thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
+
+    funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
              make_fixnum(kind),
              make_fixnum(register_offset));
 
-    undo_fake_foreign_function_call(context);
+    undo_fake_foreign_function_call(context); /* blocks signals again */
 }