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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index d4f3516..4c587eb 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -9,25 +9,24 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 #include <signal.h>
 
+#include "sbcl.h"
 #include "runtime.h"
 #include "os.h"
-#include "sbcl.h"
 #include "interrupt.h"
 #include "arch.h"
 #include "lispregs.h"
 #include "globals.h"
 #include "alloc.h"
 #include "breakpoint.h"
+#include "thread.h"
+#include "genesis/code.h"
+#include "genesis/fdefn.h"
 
 #define REAL_LRA_SLOT 0
-#ifndef __i386__
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 #define KNOWN_RETURN_P_SLOT 1
 #define BOGUS_LRA_CONSTANTS 2
 #else
@@ -39,181 +38,146 @@ 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);
+                    + 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)
 {
-#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(LISP_FEATURE_SPARC) && defined (solaris))
     undo_fake_foreign_function_call(context);
 #endif
     arch_do_displaced_inst(context, orig_inst);
 }
 
-#ifndef __i386__
 static lispobj find_code(os_context_t *context)
 {
 #ifdef reg_CODE
     lispobj code = *os_context_register_addr(context, reg_CODE);
     lispobj header;
 
-    if (LowtagOf(code) != type_OtherPointer)
-	return NIL;
+    if (lowtag_of(code) != OTHER_POINTER_LOWTAG)
+        return NIL;
 
-    header = *(lispobj *)(code-type_OtherPointer);
+    header = *(lispobj *)(code-OTHER_POINTER_LOWTAG);
 
-    if (TypeOf(header) == type_CodeHeader)
-	return code;
+    if (widetag_of(header) == CODE_HEADER_WIDETAG)
+        return code;
     else
-	return code - HeaderValue(header)*sizeof(lispobj);
+        return code - HeaderValue(header)*sizeof(lispobj);
 #else
-    return NIL;
-#endif
-}
-#endif
-
-#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;
-  } else {
-      return codeptr + type_OtherPointer;
-  }
-}
+    if (codeptr == 0)
+        return NIL;
+    else
+        return codeptr + OTHER_POINTER_LOWTAG;
 #endif
+}
 
-static int compute_offset(os_context_t *context, lispobj code)
+static long compute_offset(os_context_t *context, lispobj code)
 {
     if (code == NIL)
-	return 0;
+        return 0;
     else {
-	unsigned long code_start;
-	struct code *codeptr = (struct code *)PTR(code);
+        unsigned long code_start;
+        struct code *codeptr = (struct code *)native_pointer(code);
 #ifdef parisc
-	unsigned long pc = *os_context_pc_addr(context) & ~3;
+        unsigned long pc = *os_context_pc_addr(context) & ~3;
 #else
-	unsigned long pc = *os_context_pc_addr(context);
+        unsigned long pc = *os_context_pc_addr(context);
 #endif
 
-	code_start = (unsigned long)codeptr
-	    + HeaderValue(codeptr->header)*sizeof(lispobj);
-	if (pc < code_start)
-	    return 0;
-	else {
-	    int offset = pc - code_start;
-	    if (offset >= codeptr->code_size)
-		return 0;
-	    else
-		return make_fixnum(offset);
-	}
+        code_start = (unsigned long)codeptr
+            + HeaderValue(codeptr->header)*sizeof(lispobj);
+        if (pc < code_start)
+            return 0;
+        else {
+            long offset = pc - code_start;
+            if (offset >= codeptr->code_size)
+                return 0;
+            else
+                return make_fixnum(offset);
+        }
     }
 }
 
-#ifndef __i386__
-void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
-{
-    lispobj code;
-
-    fake_foreign_function_call(context);
-
-    code = find_code(context);
-
-    funcall3(SymbolFunction(HANDLE_BREAKPOINT),
-	     compute_offset(context, code),
-	     code,
-	     alloc_sap(context));
-
-    undo_fake_foreign_function_call(context);
-}
-#else
 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
      * use debugger breakpoints anywhere in here. */
-    sigprocmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
+    thread_sigmask(SIG_SETMASK, os_context_sigmask_addr(context), 0);
 
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
-	     compute_offset(context, code),
-	     code,
-	     context_sap);
+             compute_offset(context, code),
+             code,
+             context_sap);
 
     undo_fake_foreign_function_call(context);
 }
-#endif
 
-#ifndef __i386__
-void *handle_function_end_breakpoint(int signal, siginfo_t *info,
-				     os_context_t *context)
+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 *)PTR(code);
+    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,
-	     alloc_sap(context));
+             compute_offset(context, code),
+             code,
+             context_sap);
 
     lra = codeptr->constants[REAL_LRA_SLOT];
+
 #ifdef reg_CODE
-    if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL) {
-	*os_context_register_addr(context, reg_CODE) = lra;
-    }
+    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-type_OtherPointer+sizeof(lispobj));
-}
-#else
-void *handle_function_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 *)PTR(code);
-
-    /* Don't disallow recursive breakpoint traps. Otherwise, we can't
-     * use debugger breakpoints anywhere in here. */
-    sigprocmask(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
+}