0.9.6.56:

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

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index 5880415..d18699a 100644 (file)
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -138,7 +138,7 @@ symbol:
         .set    noreorder
        bgez    reg_NL4, 1f
         subu   reg_ALLOC, 1
-       break   0x10
+       break   0x0, 0x10
 1:     .set    reorder
 
        /* Pass in args */
@@ -162,7 +162,7 @@ symbol:
        addu    reg_LIP, reg_CODE, SIMPLE_FUN_CODE_OFFSET
        jr      reg_LIP
 
-       .align  2
+       .align  3
        .set    noreorder
 lra:   .word   RETURN_PC_HEADER_WIDETAG
 
@@ -194,7 +194,7 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        .set    noreorder
        bgez    reg_NL4, 1f
         subu   reg_ALLOC, 1
-       break   0x10
+       break   0x0, 0x10
 1:     .set    reorder
 
        /* Pass one return value back to C land. For a 64bit value, we may
@@ -272,7 +272,7 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        .set    noreorder
        bgez    reg_NL4, 1f
         subu   reg_ALLOC, 1
-       break   0x10
+       break   0x0, 0x10
 1:     .set    reorder
 
        /* Into C land we go. */
@@ -333,7 +333,7 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        .set    noreorder
        bgez    reg_NL4, 1f
         subu   reg_ALLOC, 1
-       break   0x10
+       break   0x0, 0x10
 1:     .set    reorder
 
        /* Reset the lisp stack. */
@@ -366,7 +366,7 @@ lra:        .word   RETURN_PC_HEADER_WIDETAG
        addiu   reg_CODE, - 24 + FUN_POINTER_LOWTAG
        .set    noreorder
        b       1f
-        break  trap_Cerror
+        break  0x0, trap_Cerror
        /* Error data length. */
        .byte   4
        /* Error number. */
@@ -404,15 +404,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 +430,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)