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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index d4f3516..878ada4 100644
--- 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>
 
@@ -25,9 +21,12 @@
 #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__
+#ifndef LISP_FEATURE_X86
 #define KNOWN_RETURN_P_SLOT 1
 #define BOGUS_LRA_CONSTANTS 2
 #else
@@ -39,7 +38,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,25 +57,33 @@ 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(sparc) && defined (solaris))
     undo_fake_foreign_function_call(context);
 #endif
     arch_do_displaced_inst(context, orig_inst);
 }
 
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
 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)
+    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)
+    if (widetag_of(header) == CODE_HEADER_WIDETAG)
 	return code;
     else
 	return code - HeaderValue(header)*sizeof(lispobj);
@@ -86,16 +93,17 @@ static lispobj find_code(os_context_t *context)
 }
 #endif
 
-#ifdef __i386__
+#ifdef LISP_FEATURE_X86
 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
 
@@ -105,7 +113,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,8 +133,11 @@ static int compute_offset(os_context_t *context, lispobj code)
 	}
     }
 }
-
-#ifndef __i386__
+/* 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 LISP_FEATURE_X86
 void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
 {
     lispobj code;
@@ -134,7 +145,8 @@ void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
     fake_foreign_function_call(context);
 
     code = find_code(context);
-
+    /* FIXME we're calling into Lisp with signals masked here.  Is this
+     * the right thing to do? */
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
 	     compute_offset(context, code),
 	     code,
@@ -164,9 +176,9 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
 }
 #endif
 
-#ifndef __i386__
-void *handle_function_end_breakpoint(int signal, siginfo_t *info,
-				     os_context_t *context)
+#ifndef LISP_FEATURE_X86
+void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
+				os_context_t *context)
 {
     lispobj code, lra;
     struct code *codeptr;
@@ -174,8 +186,10 @@ 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);
 
+    /* FIXME again, calling into Lisp with signals masked.  Is this
+     * sensible? */
     funcall3(SymbolFunction(HANDLE_BREAKPOINT),
 	     compute_offset(context, code),
 	     code,
@@ -188,11 +202,11 @@ void *handle_function_end_breakpoint(int signal, siginfo_t *info,
     }
 #endif
     undo_fake_foreign_function_call(context);
-    return (void *)(lra-type_OtherPointer+sizeof(lispobj));
+    return (void *)(lra-OTHER_POINTER_LOWTAG+sizeof(lispobj));
 }
 #else
-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, context_sap = alloc_sap(context);
     struct code *codeptr;
@@ -200,7 +214,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. */