0.pre7.11:

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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index d4f3516..48f8aed 100644 (file)
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -9,10 +9,6 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 #include <signal.h>
 
@@ -39,7 +35,7 @@ static void *compute_pc(lispobj code_obj, int pc_offset)
 {
     struct code *code;
 
-    code = (struct code *)PTR(code_obj);
+    code = (struct code *)native_pointer(code_obj);
     return (void *)((char *)code + HeaderValue(code->header)*sizeof(lispobj)
                    + pc_offset);
 }
@@ -58,7 +54,15 @@ void breakpoint_remove(lispobj code_obj, int pc_offset,
 void breakpoint_do_displaced_inst(os_context_t* context,
                                  unsigned long orig_inst)
 {
-#if !defined(hpux) && !defined(irix) && !defined(__i386__)
+    /* on platforms with sigreturn(), we go directly back from
+     * arch_do_displaced_inst() to lisp code, so we need to clean up
+     * our bindings now.  (side note: I'd love to know in exactly what
+     * scenario the speed of breakpoint handling is critical enough to
+     * justify this maintenance mess)
+     *
+     * -dan 2001.08.09 */
+
+#if !(defined(hpux) || defined(irix) || defined(__i386__) || defined(alpha))
     undo_fake_foreign_function_call(context);
 #endif
     arch_do_displaced_inst(context, orig_inst);
@@ -89,7 +93,8 @@ static lispobj find_code(os_context_t *context)
 #ifdef __i386__
 static lispobj find_code(os_context_t *context)
 {
-  lispobj codeptr = component_ptr_from_pc(*os_context_pc_addr(context));
+  lispobj codeptr =
+      (lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
 
   if (codeptr == 0) {
       return NIL;
@@ -105,7 +110,7 @@ static int compute_offset(os_context_t *context, lispobj code)
        return 0;
     else {
        unsigned long code_start;
-       struct code *codeptr = (struct code *)PTR(code);
+       struct code *codeptr = (struct code *)native_pointer(code);
 #ifdef parisc
        unsigned long pc = *os_context_pc_addr(context) & ~3;
 #else
@@ -125,7 +130,10 @@ static int compute_offset(os_context_t *context, lispobj code)
        }
     }
 }
-
+/* FIXME: I can see no really good reason these couldn't be merged, but haven't
+ * tried.  The sigprocmask() call would work just as well on alpha as it
+ * presumably does on x86   -dan 2001.08.10
+ */
 #ifndef __i386__
 void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
 {
@@ -174,7 +182,7 @@ void *handle_function_end_breakpoint(int signal, siginfo_t *info,
     fake_foreign_function_call(context);
 
     code = find_code(context);
-    codeptr = (struct code *)PTR(code);
+    codeptr = (struct code *)native_pointer(code);
 
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
             compute_offset(context, code),
@@ -200,7 +208,7 @@ void *handle_function_end_breakpoint(int signal, siginfo_t *info,
     fake_foreign_function_call(context);
 
     code = find_code(context);
-    codeptr = (struct code *)PTR(code);
+    codeptr = (struct code *)native_pointer(code);
 
     /* Don't disallow recursive breakpoint traps. Otherwise, we can't
      * use debugger breakpoints anywhere in here. */