X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=638b2e8a0fe28d125813a5ce89352be0b4842170;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=be487fad5f3888149c2df6b3db0bab576260470a;hpb=5c4c126f50e6fb8184bf9ae4411d17327c24cb91;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index be487fa..638b2e8 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -71,7 +71,6 @@ void breakpoint_do_displaced_inst(os_context_t* context,
     arch_do_displaced_inst(context, orig_inst);
 }
 
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 static lispobj find_code(os_context_t *context)
 {
 #ifdef reg_CODE
@@ -88,22 +87,15 @@ static lispobj find_code(os_context_t *context)
     else
         return code - HeaderValue(header)*sizeof(lispobj);
 #else
-    return NIL;
-#endif
-}
-#else
-static lispobj find_code(os_context_t *context)
-{
     lispobj codeptr =
         (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
 
-    if (codeptr == 0) {
+    if (codeptr == 0)
         return NIL;
-    } else {
+    else
         return codeptr + OTHER_POINTER_LOWTAG;
-    }
-}
 #endif
+}
 
 static long compute_offset(os_context_t *context, lispobj code)
 {
@@ -112,7 +104,7 @@ static long compute_offset(os_context_t *context, lispobj code)
     else {
         unsigned long code_start;
         struct code *codeptr = (struct code *)native_pointer(code);
-#ifdef parisc
+#ifdef LISP_FEATURE_HPPA
         unsigned long pc = *os_context_pc_addr(context) & ~3;
 #else
         unsigned long pc = *os_context_pc_addr(context);
@@ -123,8 +115,8 @@ static long compute_offset(os_context_t *context, lispobj code)
         if (pc < code_start)
             return 0;
         else {
-            long offset = pc - code_start;
-            if (offset >= codeptr->code_size)
+            unsigned long offset = pc - code_start;
+            if (offset >= (N_WORD_BYTES * fixnum_value(codeptr->code_size)))
                 return 0;
             else
                 return make_fixnum(offset);
@@ -132,20 +124,25 @@ 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;
 
     fake_foreign_function_call(context);
 
+#ifndef LISP_FEATURE_SB_SAFEPOINT
+    unblock_gc_signals(0, 0);
+#endif
     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);
@@ -153,61 +150,66 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
     undo_fake_foreign_function_call(context);
 }
 
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-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, lra;
+    lispobj code, context_sap, lra;
     struct code *codeptr;
 
     fake_foreign_function_call(context);
 
+#ifndef LISP_FEATURE_SB_SAFEPOINT
+    unblock_gc_signals(0, 0);
+#endif
+    context_sap = alloc_sap(context);
     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,
-             alloc_sap(context));
+             context_sap);
 
     lra = codeptr->constants[REAL_LRA_SLOT];
+
+#ifdef LISP_FEATURE_PPC
+    /* PPC now passes LRA objects in reg_LRA during return.  Other
+     * platforms should as well, but haven't been fixed yet. */
+    if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
+        *os_context_register_addr(context, reg_LRA) = lra;
+#else
 #ifdef reg_CODE
-    if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL) {
+    if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
         *os_context_register_addr(context, reg_CODE) = lra;
-    }
 #endif
+#endif
+
     undo_fake_foreign_function_call(context);
+
+#ifdef reg_LRA
     return (void *)(lra-OTHER_POINTER_LOWTAG+sizeof(lispobj));
-}
 #else
-void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
-                                os_context_t *context)
-{
-    lispobj code, context_sap;
-    struct code *codeptr;
+    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);
 
-    context_sap = alloc_sap(context);
-    code = find_code(context);
-    codeptr = (struct code *)native_pointer(code);
-
-    /* Don't disallow recursive breakpoint traps. Otherwise, we can't
-     * use debugger breakpoints anywhere in here. */
+#ifndef LISP_FEATURE_WIN32
     thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+#endif
 
-    funcall3(SymbolFunction(HANDLE_BREAKPOINT),
-             compute_offset(context, code),
-             code,
-             context_sap);
-
-    undo_fake_foreign_function_call(context);
+    funcall2(StaticSymbolFunction(HANDLE_SINGLE_STEP_TRAP),
+             make_fixnum(kind),
+             make_fixnum(register_offset));
 
-    return compute_pc(codeptr->constants[REAL_LRA_SLOT],
-                      fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
+    undo_fake_foreign_function_call(context); /* blocks signals again */
 }
-#endif