0.8.0.78.vector-nil-string.1:

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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 44d75f9..5ff8509 100644 (file)
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -21,6 +21,9 @@
 #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__
@@ -62,7 +65,7 @@ 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);
@@ -75,12 +78,12 @@ static lispobj find_code(os_context_t *context)
     lispobj code = *os_context_register_addr(context, reg_CODE);
     lispobj header;
 
-    if (lowtagof(code) != OTHER_POINTER_LOWTAG)
+    if (lowtag_of(code) != OTHER_POINTER_LOWTAG)
        return NIL;
 
     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);
@@ -93,14 +96,14 @@ static lispobj find_code(os_context_t *context)
 #ifdef __i386__
 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 + OTHER_POINTER_LOWTAG;
-  }
+    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