Remove an unused variable, *unwind-to-frame-function*.

[sbcl.git] / src / runtime / hppa-assem.S

diff --git a/src/runtime/hppa-assem.S b/src/runtime/hppa-assem.S
index fd2068f..97ada0c 100644 (file)
--- a/src/runtime/hppa-assem.S
+++ b/src/runtime/hppa-assem.S
@@ -108,12 +108,16 @@ call_into_lisp:
 
        /* Indirect the closure */
        ldw     CLOSURE_FUN_OFFSET(0,reg_LEXENV),reg_CODE
-       addi    6*4-FUN_POINTER_LOWTAG,reg_CODE,reg_LIP
+  addi  SIMPLE_FUN_CODE_OFFSET,reg_CODE,reg_LIP
 
-       /* And into lisp we go. */
-       .export break_here
-break_here:    
-       be,n    0(%sr5,reg_LIP)
+#ifdef LISP_FEATURE_HPUX
+  /*  Get the stub address, ie assembly-routine return-from-lisp */
+  addil   L%return_from_lisp_stub-$global$,%dp
+  ldw     R%return_from_lisp_stub-$global$(0,%r1),reg_NL0
+  be,n  0(%sr5,reg_NL0)
+#else                 
+  be,n  0(%sr5,reg_NL0)
+#endif
 
        break   0,0
 
@@ -432,10 +436,15 @@ SingleStepTraps:
        there's a break 0,0 in the new version here!!!
 */
 
+/*
+ * For an explanation of the magic involved in function-end
+ * breakpoints, see the implementation in ppc-assem.S.
+ */
+
        .align  8
        .export fun_end_breakpoint_guts
 fun_end_breakpoint_guts:
-       .word   RETURN_PC_HEADER_WIDETAG
+       .word   RETURN_PC_HEADER_WIDETAG + 0x800
        /* multiple value return point -- just jump to trap. */
        b,n     fun_end_breakpoint_trap
        /* single value return point -- convert to multiple w/ n=1 */