1.0.4.39: get rid of hardcoded mutex and spinlock slot indexes

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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index edee7b3..7892dc1 100644 (file)
--- 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;
@@ -185,3 +184,26 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     return compute_pc(lra, fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
 #endif
 }
+
+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),
+             context_sap,
+             make_fixnum(kind),
+             make_fixnum(register_offset));
+
+    undo_fake_foreign_function_call(context); /* blocks signals again */
+}