1.0.2.20:

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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 4c587eb..5bbc108 100644 (file)
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -133,9 +133,11 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
     context_sap = alloc_sap(context);
     code = find_code(context);
 
+#ifndef LISP_FEATURE_WIN32
     /* Don't disallow recursive breakpoint traps. Otherwise, we can't
      * use debugger breakpoints anywhere in here. */
     thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
 
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
@@ -157,9 +159,11 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     code = find_code(context);
     codeptr = (struct code *)native_pointer(code);
 
+#ifndef LISP_FEATURE_WIN32
     /* Don't disallow recursive breakpoint traps. Otherwise, we can't
      * use debugger breakpoints anywhere in here. */
     thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
 
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
@@ -181,3 +185,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 */
+}