From: Thiemo Seufer <ths@networkno.de>
Date: Sun, 4 Dec 2005 23:24:13 +0000 (+0000)
Subject: 0.9.7.15:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=3f13400e4297ea4b572da50e5fc926b2c3a3f07b;p=sbcl.git

0.9.7.15:
	Mark as foreing function call before the first tagged Lisp
	register gets clobbered.
---

diff --git a/src/runtime/mips-assem.S b/src/runtime/mips-assem.S
index d18699a..4be3628 100644
--- 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,8 +155,12 @@ 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	3
@@ -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)
diff --git a/version.lisp-expr b/version.lisp-expr
index 697792e..8b84a19 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.7.14"
+"0.9.7.15"