X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=1c8a92353adf1ccf6a0cbb93f78f2349b4c128c6;hb=70227794f1eefb567c13ec04f7bd6d3b6794aa29;hp=c723b309a3bb994a2a158bfa16bdcace17af0c13;hpb=76b9a8018c36f764336ec6f5e4a3717b9e9be2bb;p=sbcl.git

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index c723b30..1c8a923 100644
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -358,19 +358,33 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	.word	NIL /* arglist */
 	.word	NIL /* type */
 	LEAF(undefined_tramp)
-        break	trap_Error
-        .byte	4
-        .byte	UNDEFINED_FUN_ERROR
-        .byte	254
-        .byte	(0xc0 + sc_DescriptorReg)
-        .byte	1
+	.set	noreorder
+	/* Continuable errors break here for some reason.
+	b	1f
+	 break	trap_Cerror */
+	break	trap_Error
+	/* Error data length. */
+	.byte	4
+	/* Error number. */
+	.byte	UNDEFINED_FUN_ERROR
+	/* Magic value 254 means a 16bit little endian value follows.
+	   See interr.c:describe_internal_error. */
+	.byte	254
+	/* reg_FDEFN is #14. */
+	.byte	((14 << 5) + sc_DescriptorReg) % 0x100
+	.byte	((14 << 5) + sc_DescriptorReg) / 0x100
 	.align	2
+	.set	reorder
+1:	lw	reg_LIP, FDEFN_RAW_ADDR_OFFSET(reg_FDEFN)
+	jr	reg_LIP
 	END(undefined_tramp)
 
 /*
  * The closure trampoline.
  */
- 	.align	2
+ 	.align	5 /* common MIPS cacheline size */
+	.word	0 /* pad 1 */
+	.word	0 /* pad 2 */
 	.word	SIMPLE_FUN_HEADER_WIDETAG /* header */
 	.word	closure_tramp - SIMPLE_FUN_CODE_OFFSET /* self */
 	.word	NIL /* next */
@@ -387,7 +401,7 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 /*
  * Function-end breakpoint magic.
  */
-	.align	3
+	.align	2
 	LEAF(fun_end_breakpoint_guts)
 	.set	noreorder
 	.word	RETURN_PC_HEADER_WIDETAG