X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-assem.S;h=5a89a4a2832572acabcaed7bc5aa950f2d0af3fa;hb=1439811447104b32d986bab40d6e2ed431247004;hp=8101da2b097e84ba44ec7eb3ff4786038016c84b;hpb=7244742c3a9478d13d813aaae8135973eb4b89aa;p=sbcl.git

diff --git a/src/runtime/x86-assem.S b/src/runtime/x86-assem.S
index 8101da2..5a89a4a 100644
--- a/src/runtime/x86-assem.S
+++ b/src/runtime/x86-assem.S
@@ -79,7 +79,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 END()
 #define TRAP ud2
 #else
@@ -272,10 +272,10 @@ Ldone:
 #endif
 
 	/* Alloc new frame. */
-	mov	%esp,%ebx	# The current sp marks start of new frame.
-	push	%ebp		# fp in save location S0
-	sub	$8,%esp		# Ensure 3 slots are allocated, one above.
-	mov	%ebx,%ebp	# Switch to new frame.
+	push	%ebp            # Dummy for return address
+	push	%ebp		# fp in save location S1
+	mov	%esp,%ebp	# The current sp marks start of new frame.
+	sub	$4,%esp		# Ensure 3 slots are allocated, two above.
 
 	call	*CLOSURE_FUN_OFFSET(%eax)
 	
@@ -338,6 +338,7 @@ GNAME(fpu_restore):
 	TYPE(GNAME(undefined_tramp))
         .byte   0, 0, 0, SIMPLE_FUN_HEADER_WIDETAG
 GNAME(undefined_tramp):
+	pop	4(%ebp)         # Save return PC for backtrace.
 	TRAP
 	.byte	trap_Error
         .byte   2