X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=f7f9e90a7bb6525b753e8c265af6f08315d4dd56;hb=5fb561a1daba0b6dbd76f7347d4b0fa4b02494a6;hp=4c587ebc22b9ef2801e9547e2c2f97a6184f806b;hpb=e08e932c669e0ca9382ffe4d7a4b3b484bd3cccf;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 4c587eb..f7f9e90 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -115,7 +115,7 @@ static long compute_offset(os_context_t *context, lispobj code)
         if (pc < code_start)
             return 0;
         else {
-            long offset = pc - code_start;
+            unsigned long offset = pc - code_start;
             if (offset >= codeptr->code_size)
                 return 0;
             else
@@ -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;
 
@@ -133,11 +133,13 @@ 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),
+    funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
              code,
              context_sap);
@@ -145,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;
@@ -157,11 +158,13 @@ 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),
+    funcall3(StaticSymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
              code,
              context_sap);
@@ -181,3 +184,19 @@ 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)
+{
+    fake_foreign_function_call(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); /* blocks signals again */
+}