0.9.9.31:

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

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index f9ca519..4be3628 100644 (file)
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -122,9 +122,6 @@ symbol:
        li      reg_ALLOC, 1
         .set    reorder
 
-       /* Mark us as in Lisp land. */
-       sw      zero, foreign_function_call_active
-
        /* Load the allocation pointer, preserving the low-bit of alloc */
        lw      reg_BSP, dynamic_space_free_pointer
        addu    reg_ALLOC, reg_BSP
@@ -158,11 +155,15 @@ symbol:
        /* Indirect closure */
        lw      reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
 
-       /* Jump into lisp land. */
        addu    reg_LIP, reg_CODE, SIMPLE_FUN_CODE_OFFSET
+
+       /* Mark us as in Lisp land. */
+       sw      zero, foreign_function_call_active
+
+       /* Jump into lisp land. */
        jr      reg_LIP
 
-       .align  2
+       .align  3
        .set    noreorder
 lra:   .word   RETURN_PC_HEADER_WIDETAG
 
@@ -180,6 +181,9 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        addu    reg_ALLOC, 1
        .set    reorder
 
+       /* Mark us as in C land. */
+       sw      reg_CSP, foreign_function_call_active
+
        /* Save LISP state. */
        subu    reg_NL0, reg_ALLOC, 1
        sw      reg_NL0, dynamic_space_free_pointer
@@ -187,9 +191,6 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        sw      reg_CSP, current_control_stack_pointer
        sw      reg_CFP, current_control_frame_pointer
 
-       /* Mark us as in C land. */
-       sw      reg_CSP, foreign_function_call_active
-
        /* Check for interrupt */
        .set    noreorder
        bgez    reg_NL4, 1f
@@ -251,6 +252,9 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        addu    reg_ALLOC, 1
        .set    reorder
 
+       /* Mark us as in C land. */
+       sw      reg_CSP, foreign_function_call_active
+
        /* Convert the return address to an offset and save it on the stack. */
        subu    reg_NFP, reg_LIP, reg_CODE
        addu    reg_NFP, OTHER_POINTER_LOWTAG
@@ -265,9 +269,6 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        sw      reg_CSP, current_control_stack_pointer
        sw      reg_CFP, current_control_frame_pointer
 
-       /* Mark us as in C land. */
-       sw      reg_CSP, foreign_function_call_active
-
        /* Check for interrupt */
        .set    noreorder
        bgez    reg_NL4, 1f
@@ -314,9 +315,6 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        li      reg_ALLOC, 1
        .set    reorder
 
-       /* Mark us as in Lisp land. */
-       sw      zero, foreign_function_call_active
-
        /* Load the allocation pointer, preserving the low-bit of alloc */
        lw      reg_BSP, dynamic_space_free_pointer
        addu    reg_ALLOC, reg_BSP
@@ -341,6 +339,9 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        move    reg_CSP, reg_CFP
        move    reg_CFP, reg_OCFP
 
+       /* Mark us as in Lisp land. */
+       sw      zero, foreign_function_call_active
+
        /* Return to LISP. */
        jr      reg_LIP
        END(call_into_c)
@@ -404,15 +405,17 @@ lra:      .word   RETURN_PC_HEADER_WIDETAG
        END(closure_tramp)
 
 /*
- * Function-end breakpoint magic.
+ * Function-end breakpoint magic. This is truely magic, the code is
+ * copied and has to be relocatable. It also needs a properly aligned
+ * header tag after the fun_end_breakpoint_guts symbol.
  */
-       .align  3 /* minimum alignment for a lisp object */
-       .set    noreorder
-       .word   RETURN_PC_HEADER_WIDETAG
+       .align  3 /* minimum alignment for a lisp object */
        LEAF(fun_end_breakpoint_guts)
-       b       multiple_value_return
+       .set    noreorder
+       .word   RETURN_PC_HEADER_WIDETAG
+       b       multiple_value_return
         nop
-       .set    reorder
+       .set    reorder
 
        /* single value return */
 
@@ -428,7 +431,7 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
 multiple_value_return:
 
        FEXPORT(fun_end_breakpoint_trap)
-       break   trap_FunEndBreakpoint
+       break   0x0, trap_FunEndBreakpoint
        b       multiple_value_return
        EXPORT(fun_end_breakpoint_end)
        END(fun_end_breakpoint_guts)