X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=c654861cd30be40ff01372b9376b363b3c6fa61e;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=1751d5d7266ae35d9887fb1fa36b969091e94766;hpb=cd056980425e3fa67b8b77de3936ccb46508c3b0;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index 1751d5d..c654861 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -117,20 +117,26 @@ GNAME(call_into_lisp):
 	mov	%rsp,%rbp	# Establish new frame.
 Lstack:
 	/* FIXME x86 saves FPU state here */
-	push	%rbx
-	push	%r12
-	push	%r13
-	push	%r14
-	push	%r15
-
+	push	%rbx  	# these regs are callee-saved according to C
+	push	%r12	# so must be preserved and restored when 
+	push	%r13    # the lisp function returns
+	push	%r14    #
+	push	%r15    #
 
 	mov	%rsp,%rbx	# remember current stack
 	push	%rbx		# Save entry stack on (maybe) new stack.
 
-	/* Establish Lisp args. */
-	mov	%rdi,%rax	# lexenv?
-	mov	%rsi,%rbx	# address of arg vec
-	mov	%rdx,%rcx	# num args
+	push	%rdi	# args from C
+	push	%rsi	#
+	push	%rdx	#
+#ifdef LISP_FEATURE_SB_THREAD
+	mov	specials,%rdi
+	call    pthread_getspecific
+	mov	%rax,%r12
+#endif
+	pop	%rcx	# num args
+	pop	%rbx	# arg vector
+	pop	%rax	# function ptr/lexenv
 
 	xor	%rdx,%rdx	# clear any descriptor registers 
 	xor	%rdi,%rdi	# that we can't be sure we'll 
@@ -328,12 +334,12 @@ GNAME(post_signal_tramp):
 	popq %r8
 	popq %rdi
 	popq %rsi
-	addq $8, %rsp
-	popq %rsp
-	popq %rdx
+        /* skip RBP and RSP */
 	popq %rbx
+	popq %rdx
 	popq %rcx
 	popq %rax
+        popfq
 	leave
 	ret
 	.size GNAME(post_signal_tramp),.-GNAME(post_signal_tramp)