0.8.4.1

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

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 716bc21..878ada4 100644 (file)
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -21,13 +21,12 @@
 #include "globals.h"
 #include "alloc.h"
 #include "breakpoint.h"
+#include "thread.h"
 #include "genesis/code.h"
 #include "genesis/fdefn.h"
-#include "genesis/symbol.h"
-#include "genesis/static-symbols.h"
 
 #define REAL_LRA_SLOT 0
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
 #define KNOWN_RETURN_P_SLOT 1
 #define BOGUS_LRA_CONSTANTS 2
 #else
@@ -72,7 +71,7 @@ void breakpoint_do_displaced_inst(os_context_t* context,
     arch_do_displaced_inst(context, orig_inst);
 }
 
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
 static lispobj find_code(os_context_t *context)
 {
 #ifdef reg_CODE
@@ -94,7 +93,7 @@ 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 =
@@ -138,7 +137,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__
+#ifndef LISP_FEATURE_X86
 void handle_breakpoint(int signal, siginfo_t *info, os_context_t *context)
 {
     lispobj code;
@@ -146,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,
@@ -176,7 +176,7 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
 }
 #endif
 
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
 void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
                                os_context_t *context)
 {
@@ -188,6 +188,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,