X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-assem.S;h=c29acebe3567bb0a4aed8671a3f2d16436c3292b;hb=9e83e3dc367e4fd47d3b27a170cb3a87bb5b1b39;hp=1b4ac54c03b46d517a8508be4f724a54baf6f3d1;hpb=53ab0266f9a92943cc93f675cc727d01cfa55474;p=sbcl.git

diff --git a/src/runtime/x86-64-assem.S b/src/runtime/x86-64-assem.S
index 1b4ac54..c29aceb 100644
--- a/src/runtime/x86-64-assem.S
+++ b/src/runtime/x86-64-assem.S
@@ -25,7 +25,7 @@
 #include "genesis/thread.h"
 	
 /* Minimize conditionalization for different OS naming schemes. */
-#if defined __linux__  || defined __FreeBSD__ || defined __OpenBSD__ || defined __sun
+#if defined __linux__  || defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__ || defined __sun
 #define GNAME(var) var
 #else
 #define GNAME(var) _##var
@@ -33,7 +33,7 @@
 
 /* Get the right type of alignment. Linux, FreeBSD and OpenBSD
  * want alignment in bytes. */
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun)
+#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined __NetBSD__ || defined(__sun)
 #define align_4byte	4
 #define align_8byte	8
 #define align_16byte	16
@@ -67,7 +67,7 @@
  * for this instruction in the SIGILL handler and if we see it, we
  * advance the EIP by two bytes to skip over ud2 instruction and
  * call sigtrap_handler. */
-#if defined(LISP_FEATURE_DARWIN)
+#if defined(LISP_FEATURE_UD2_BREAKPOINTS)
 #define TRAP ud2
 #else
 #define TRAP int3
@@ -209,10 +209,10 @@ Ldone:
 	xor	%rbx,%rbx	# available
 
 	/* Alloc new frame. */
-	mov	%rsp,%rbx	# The current sp marks start of new frame.
-	push	%rbp		# fp in save location S0
-	sub	$16,%rsp	# Ensure 3 slots are allocated, one above.
-	mov	%rbx,%rbp	# Switch to new frame.
+	push	%rbp            # Dummy for return address
+	push	%rbp		# fp in save location S1
+	mov	%rsp,%rbp	# The current sp marks start of new frame.
+	sub	$8,%rsp	        # Ensure 3 slots are allocated, two above.
 
 Lcall:
 	call	*CLOSURE_FUN_OFFSET(%rax)
@@ -235,7 +235,7 @@ LsingleValue:
 
 /* FIXME Restore the NPX state. */
 
-	/* return value is already in rax where lisp expects it */
+	mov	%rdx,%rax	# c-val
 	leave
 	ret
 	SIZE(GNAME(call_into_lisp))
@@ -266,6 +266,7 @@ GNAME(fpu_restore):
 	.globl  GNAME(undefined_tramp)
 	TYPE(GNAME(undefined_tramp))
 GNAME(undefined_tramp):
+	pop	8(%rbp)         # Save return PC for backtrace.
 	TRAP
 	.byte	trap_Error
         .byte   2