X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=70e5117bdd4cd8afcfe2e4888c2c47b14ccd2380;hb=449088454569070e400f9f562c247bdc17cf60b5;hp=34a2bdf7a9c77110b422fbd9dbf285bc6d569dcf;hpb=be9eb6c67b5f43a095c3de17bea945c309d662e4;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 34a2bdf..70e5117 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -12,18 +12,21 @@
 #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
@@ -62,25 +65,25 @@ void breakpoint_do_displaced_inst(os_context_t* context,
      *
      * -dan 2001.08.09 */
 
-#if !(defined(hpux) || defined(irix) || defined(__i386__) || defined(alpha))
+#if (defined(sparc) && defined (solaris))
     undo_fake_foreign_function_call(context);
 #endif
     arch_do_displaced_inst(context, orig_inst);
 }
 
-#ifndef __i386__
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 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);
@@ -88,23 +91,21 @@ static lispobj find_code(os_context_t *context)
     return NIL;
 #endif
 }
-#endif
-
-#ifdef __i386__
+#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) {
-      return NIL;
-  } else {
-      return codeptr + type_OtherPointer;
-  }
+    lispobj codeptr =
+	(lispobj)component_ptr_from_pc((lispobj *)(*os_context_pc_addr(context)));
+
+    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;
@@ -122,7 +123,7 @@ static int compute_offset(os_context_t *context, lispobj code)
 	if (pc < code_start)
 	    return 0;
 	else {
-	    int offset = pc - code_start;
+	    long offset = pc - code_start;
 	    if (offset >= codeptr->code_size)
 		return 0;
 	    else
@@ -134,7 +135,7 @@ static int compute_offset(os_context_t *context, lispobj code)
  * tried.  The sigprocmask() call would work just as well on alpha as it
  * presumably does on x86   -dan 2001.08.10
  */
-#ifndef __i386__
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
 {
     lispobj code;
@@ -142,7 +143,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,
@@ -172,7 +174,7 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
 }
 #endif
 
-#ifndef __i386__
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
 				os_context_t *context)
 {
@@ -184,6 +186,8 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     code = find_code(context);
     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,
@@ -196,7 +200,7 @@ void *handle_fun_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_fun_end_breakpoint(int signal, siginfo_t *info,