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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index cf829ad..4c587eb 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -43,19 +43,19 @@ static void *compute_pc(lispobj code_obj, int pc_offset)
                     + pc_offset);
 }
 
-unsigned long breakpoint_install(lispobj code_obj, int pc_offset)
+unsigned int breakpoint_install(lispobj code_obj, int pc_offset)
 {
     return arch_install_breakpoint(compute_pc(code_obj, pc_offset));
 }
 
 void breakpoint_remove(lispobj code_obj, int pc_offset,
-                       unsigned long orig_inst)
+                       unsigned int orig_inst)
 {
     arch_remove_breakpoint(compute_pc(code_obj, pc_offset), orig_inst);
 }
 
 void breakpoint_do_displaced_inst(os_context_t* context,
-                                  unsigned long orig_inst)
+                                  unsigned int orig_inst)
 {
     /* on platforms with sigreturn(), we go directly back from
      * arch_do_displaced_inst() to lisp code, so we need to clean up
@@ -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)
 {
@@ -134,10 +126,11 @@ static long compute_offset(os_context_t *context, lispobj code)
 
 void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
 {
-    lispobj code, context_sap = alloc_sap(context);
+    lispobj code, context_sap;
 
     fake_foreign_function_call(context);
 
+    context_sap = alloc_sap(context);
     code = find_code(context);
 
     /* Don't disallow recursive breakpoint traps. Otherwise, we can't
@@ -152,15 +145,15 @@ 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)
 {
-    lispobj code, lra;
+    lispobj code, context_sap, lra;
     struct code *codeptr;
 
     fake_foreign_function_call(context);
 
+    context_sap = alloc_sap(context);
     code = find_code(context);
     codeptr = (struct code *)native_pointer(code);
 
@@ -171,41 +164,20 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
              compute_offset(context, code),
              code,
-             alloc_sap(context));
+             context_sap);
 
     lra = codeptr->constants[REAL_LRA_SLOT];
+
 #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
-    undo_fake_foreign_function_call(context);
-    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 = alloc_sap(context);
-    struct code *codeptr;
-
-    fake_foreign_function_call(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. */
-    thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
-
-    funcall3(SymbolFunction(HANDLE_BREAKPOINT),
-             compute_offset(context, code),
-             code,
-             context_sap);
 
     undo_fake_foreign_function_call(context);
 
-    return compute_pc(codeptr->constants[REAL_LRA_SLOT],
-                      fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
-}
+#ifdef reg_LRA
+    return (void *)(lra-OTHER_POINTER_LOWTAG+sizeof(lispobj));
+#else
+    return compute_pc(lra, fixnum_value(codeptr->constants[REAL_LRA_SLOT+1]));
 #endif
+}