X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fx86-64-assem.S;h=1b4ac54c03b46d517a8508be4f724a54baf6f3d1;hb=9abfd1a2b22862570c15ffa5129b1196d0480290;hp=42d21da5e7d5cd33aa386deb92058f95a04b5c58;hpb=9a19ce460a70a6c1de36095b3e2621116b91cc80;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index 42d21da..1b4ac54 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -25,15 +25,15 @@
 #include "genesis/thread.h"
 	
 /* Minimize conditionalization for different OS naming schemes. */
-#if defined __linux__  || defined __FreeBSD__ /* (but *not* OpenBSD) */
+#if defined __linux__  || defined __FreeBSD__ || defined __OpenBSD__ || defined __sun
 #define GNAME(var) var
 #else
 #define GNAME(var) _##var
 #endif
 
-/* Get the right type of alignment. Linux and FreeBSD (but not OpenBSD)
+/* Get the right type of alignment. Linux, FreeBSD and OpenBSD
  * want alignment in bytes. */
-#if defined(__linux__) || defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
 #define align_4byte	4
 #define align_8byte	8
 #define align_16byte	16
@@ -105,9 +105,6 @@
 	.globl  GNAME(call_into_c)
 	TYPE(GNAME(call_into_c))
 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.
 
@@ -131,8 +128,7 @@ GNAME(call_into_c):
 	.globl  GNAME(call_into_lisp_first_time)
 	TYPE(GNAME(call_into_lisp_first_time))
 		
-/* The *ALIEN-STACK* pointer is set up on the first call_into_lisp when
- * the stack changes.  We don't worry too much about saving registers 
+/* We don't worry too much about saving registers 
  * here, because we never expect to return from the initial call to lisp 
  * anyway */
 	
@@ -140,16 +136,12 @@ GNAME(call_into_c):
 GNAME(call_into_lisp_first_time):
 	push	%rbp		# Save old frame pointer.
 	mov	%rsp,%rbp	# Establish new frame.
-	mov     %rsp,ALIEN_STACK + SYMBOL_VALUE_OFFSET
 #if defined(LISP_FEATURE_DARWIN)
 	movq    GSYM(GNAME(all_threads)),%rax
 #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	
@@ -241,10 +233,6 @@ LsingleValue:
 	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 */
@@ -256,19 +244,17 @@ LsingleValue:
 	.text
 	.globl 	GNAME(fpu_save)
 	TYPE(GNAME(fpu_save))
-	.align	2,0x90
+	.align	align_16byte,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))
 
 	.globl 	GNAME(fpu_restore)
 	TYPE(GNAME(fpu_restore))
-	.align	2,0x90
+	.align	align_16byte,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))
 
@@ -379,6 +365,7 @@ GNAME(fun_end_breakpoint_guts):
 multiple_value_return:
 	
 	.globl  GNAME(fun_end_breakpoint_trap)
+	.align	align_16byte,0x90
 GNAME(fun_end_breakpoint_trap):
 	TRAP
 	.byte 	trap_FunEndBreakpoint