X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-assem.S;h=c2959930e4279405d9e37ac01670038d51df56c5;hb=ba9112b2f0ba10230be5bdfc75c8e082da9bfbe0;hp=ca4cfd06719388a49cfa49fc08f5b5cc2382db12;hpb=b9e94e326f79ab01e56cb437e424ce5ea489471f;p=sbcl.git

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index ca4cfd0..c295993 100644
--- a/src/runtime/mips-assem.S
+++ b/src/runtime/mips-assem.S
@@ -192,14 +192,14 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	/* Nested lisp -> C calls may have clobbered gp. */
 	lw	gp, framesize-16(sp)
 
+	/* Mark us as in C land. */
+	sw	reg_CSP, foreign_function_call_active
+
 	/* Set the pseudo-atomic flag. */
 	li	reg_NL4, 0
 	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
@@ -262,15 +262,15 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	move	reg_CFP, reg_CSP
 	addu	reg_CSP, reg_CFP, 32
 
+	/* Mark us as in C land. */
+	sw	reg_CSP, foreign_function_call_active
+
 	/* Set the pseudo-atomic flag. */
 	.set	noreorder
 	li	reg_NL4, 0
 	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
@@ -374,13 +374,14 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	.word   NIL /* name */
 	.word	NIL /* arglist */
 	.word	NIL /* type */
+	.word	NIL /* xrefs */
 	LEAF(undefined_tramp)
 	/* Point reg_CODE to the header and tag it as function, since
 	   the debugger regards a function pointer in reg_CODE which
 	   doesn't point to a code object as undefined function.  */
 	lui	reg_CODE, %hi(undefined_tramp)
 	addiu	reg_CODE, %lo(undefined_tramp)
-	addiu	reg_CODE, - 24 + FUN_POINTER_LOWTAG
+	addiu	reg_CODE, -SIMPLE_FUN_CODE_OFFSET
 	.set	noreorder
 	b	1f
 	 break	0x0, trap_Cerror
@@ -413,6 +414,7 @@ lra:	.word	RETURN_PC_HEADER_WIDETAG
 	.word   NIL /* name */
 	.word	NIL /* arglist */
 	.word	NIL /* type */
+	.word	NIL /* xrefs */
 	LEAF(closure_tramp)
         lw	reg_LEXENV, FDEFN_FUN_OFFSET(reg_FDEFN)
         lw	reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
@@ -432,6 +434,7 @@ funcallable_instance_tramp = . + 1
 	.word	NIL
 	.word	NIL
 	.word	NIL
+	.word	NIL
 
 	lw	reg_LEXENV, FUNCALLABLE_INSTANCE_FUNCTION_OFFSET(reg_LEXENV)
 	lw	reg_CODE, CLOSURE_FUN_OFFSET(reg_LEXENV)
@@ -466,7 +469,16 @@ funcallable_instance_tramp = . + 1
 multiple_value_return:
 
 	FEXPORT(fun_end_breakpoint_trap)
-	break	0x0, trap_FunEndBreakpoint
+	.set    noreorder
 	b	multiple_value_return
+	 break	0x0, trap_FunEndBreakpoint
+	.set    reorder
 	EXPORT(fun_end_breakpoint_end)
 	END(fun_end_breakpoint_guts)
+
+
+	.align  3 /* minimum alignment for a lisp object */
+        LEAF(do_pending_interrupt)
+	break	0x0, trap_PendingInterrupt
+	jr	reg_LIP
+	END(do_pending_interrupt)