X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fbreakpoint.c;h=f7f9e90a7bb6525b753e8c265af6f08315d4dd56;hb=4b585c19dcd87dc3410094a2d2d7385d49200a44;hp=5bbc108c85bd39f5f32cc6d228f65ca353b6d3f3;hpb=57fed64f9b9aa96adb66dbe1241d37bd773f638d;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 5bbc108..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;
 
@@ -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);
@@ -189,20 +188,13 @@ 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),
-             context_sap,
+    funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
              make_fixnum(kind),
              make_fixnum(register_offset));