X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=92e07164e7bcaaef94c28990131128a08db362c2;hb=447477e72bd4fe54e678a28bdcc4a2802797d6ed;hp=dbabd4d1ee617a4385ed1f7ef0b8a74f92df3dca;hpb=6e6670a5c26b3594a0eaa8da59db75b48e0db878;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index dbabd4d..92e0716 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -60,6 +60,10 @@
 	.global GNAME(call_into_c)
 	.type	GNAME(call_into_c),@function
 GNAME(call_into_c):
+        /* ABI requires that the direction flag be clear on function
+         * entry and exit. */
+        cld
+        
 	push	%rbp		# Save old frame pointer.
 	mov	%rsp,%rbp	# Establish new frame.
 
@@ -166,8 +170,9 @@ Lcall:
 	
 	/* If the function returned multiple values, it will return to
 	   this point.  Lose them */
+	jnc	LsingleValue	
 	mov	%rbx, %rsp
-	/* A singled value function returns here */
+LsingleValue:	
 
 /* Restore the stack, in case there was a stack change. */
 	pop	%rsp		# c-sp
@@ -179,6 +184,10 @@ Lcall:
 	pop	%r12
 	pop	%rbx
 
+        /* ABI requires that the direction flag be clear on function
+         * entry and exit. */
+        cld
+        
 /* FIXME Restore the NPX state. */
 
 	/* return value is already in rax where lisp expects it */
@@ -282,11 +291,7 @@ GNAME(closure_tramp):
 	.align	align_8byte
 GNAME(fun_end_breakpoint_guts):
 	/* Multiple Value return */
-	jmp	multiple_value_return
-	/* the above jmp is only 2 bytes long, we need to add a nop for 
-	 * padding since the single value return convention jumps to original
-	 * return address + 3 bytes */
-	nop
+	jc	multiple_value_return
 	/* Single value return: The eventual return will now use the
 	   multiple values return convention but with a return values
 	   count of one. */
@@ -384,5 +389,4 @@ Lend:
 	ret
 	.size	GNAME(fast_bzero), .-GNAME(fast_bzero)
 
-
         .end