X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=c90bd0e1ea0246d8891cb080dfd99f8710ac8b12;hb=e67cc0f952040723f7d0f37ddb88fe895f4b1464;hp=44d75f965d39680450fae83b58dce8cd25e2f8de;hpb=6fb6e66f531dfb6140ec3e0cc8f84f6ecd1927ca;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 44d75f9..c90bd0e 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(LISP_FEATURE_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) != 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);
@@ -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 + 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
 
-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
@@ -130,27 +131,7 @@ static int compute_offset(os_context_t *context, lispobj code)
 	}
     }
 }
-/* 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 __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);
@@ -170,9 +151,8 @@ void handle_breakpoint(int signal, siginfo_t* info, os_context_t *context)
 
     undo_fake_foreign_function_call(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 +164,10 @@ void *handle_fun_end_breakpoint(int signal, siginfo_t *info,
     code = find_code(context);
     codeptr = (struct code *)native_pointer(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,