X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=d18699aa4e972396bd14af5d09db21fed1795f00;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=f9ca519bd11eba0a54b31a633451b1404ab7bbaa;hpb=40b6c8b10330df5f1a3cc17e309857a7465ebc3f;p=sbcl.git

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index f9ca519..d18699a 100644
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -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
 
@@ -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)