X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbreakpoint.c;h=5cada3e5916e47a301399ccc41f42716a8fea923;hb=597826f00530e8d0c6f4a8ccda2e366f56b65579;hp=846fa777c1e1e15a4606f1e30d26c09b5b72baca;hpb=e2b2b8f2156ede16d70a0bdd0cfad29ea31b8ccc;p=sbcl.git

diff --git a/src/runtime/breakpoint.c b/src/runtime/breakpoint.c
index 846fa77..5cada3e 100644
--- a/src/runtime/breakpoint.c
+++ b/src/runtime/breakpoint.c
@@ -104,7 +104,7 @@ static long compute_offset(os_context_t *context, lispobj code)
     else {
         unsigned long code_start;
         struct code *codeptr = (struct code *)native_pointer(code);
-#ifdef parisc
+#ifdef LISP_FEATURE_HPPA
         unsigned long pc = *os_context_pc_addr(context) & ~3;
 #else
         unsigned long pc = *os_context_pc_addr(context);
@@ -115,8 +115,8 @@ static long compute_offset(os_context_t *context, lispobj code)
         if (pc < code_start)
             return 0;
         else {
-            long offset = pc - code_start;
-            if (offset >= codeptr->code_size)
+            unsigned long offset = pc - code_start;
+            if (offset >= (N_WORD_BYTES * fixnum_value(codeptr->code_size)))
                 return 0;
             else
                 return make_fixnum(offset);
@@ -130,6 +130,7 @@ void handle_breakpoint(os_context_t *context)
 
     fake_foreign_function_call(context);
 
+    unblock_gc_signals(0, 0);
     context_sap = alloc_sap(context);
     code = find_code(context);
 
@@ -154,6 +155,7 @@ void *handle_fun_end_breakpoint(os_context_t *context)
 
     fake_foreign_function_call(context);
 
+    unblock_gc_signals(0, 0);
     context_sap = alloc_sap(context);
     code = find_code(context);
     codeptr = (struct code *)native_pointer(code);
@@ -171,10 +173,17 @@ void *handle_fun_end_breakpoint(os_context_t *context)
 
     lra = codeptr->constants[REAL_LRA_SLOT];
 
+#ifdef LISP_FEATURE_PPC
+    /* PPC now passes LRA objects in reg_LRA during return.  Other
+     * platforms should as well, but haven't been fixed yet. */
+    if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
+        *os_context_register_addr(context, reg_LRA) = lra;
+#else
 #ifdef reg_CODE
     if (codeptr->constants[KNOWN_RETURN_P_SLOT] == NIL)
         *os_context_register_addr(context, reg_CODE) = lra;
 #endif
+#endif
 
     undo_fake_foreign_function_call(context);