X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=5f1ff8b2dc04d27ceb3851b70d208b5d0a409b7f;hb=2c06e3056fe6aa820817a927fa0e840eb7b8edb7;hp=02cbf26b55fed21c6ddda86f81fced0e0482810f;hpb=1a19da9ff50a45962fc2cf42c7a241a2ce97a364;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index 02cbf26..5f1ff8b 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -143,10 +143,7 @@ GNAME(call_into_lisp_first_time):
 #else
         movq    GNAME(all_threads),%rax
 #endif
-	mov     THREAD_CONTROL_STACK_START_OFFSET(%rax) ,%rsp
-	/* don't think too hard about what happens if we get interrupted
-	* here */
-        add 	$(THREAD_CONTROL_STACK_SIZE)-16,%rsp
+	mov     THREAD_CONTROL_STACK_END_OFFSET(%rax) ,%rsp
 	jmp     Lstack
 
 	.text	
@@ -251,8 +248,7 @@ LsingleValue:
 	TYPE(GNAME(fpu_save))
 	.align	2,0x90
 GNAME(fpu_save):
-	mov	4(%rsp),%rax
-	fnsave	(%rax)		# Save the NPX state. (resets NPX)
+	fnsave	(%rdi)		# Save the NPX state. (resets NPX)
 	ret
 	SIZE(GNAME(fpu_save))
 
@@ -260,8 +256,7 @@ GNAME(fpu_save):
 	TYPE(GNAME(fpu_restore))
 	.align	2,0x90
 GNAME(fpu_restore):
-	mov	4(%rsp),%rax
-	frstor	(%rax)		# Restore the NPX state.
+	frstor	(%rdi)		# Restore the NPX state.
 	ret
 	SIZE(GNAME(fpu_restore))