X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fassembly%2Fx86%2Fassem-rtns.lisp;h=9efecb9f28c4cbdaf7416d9cfd83019946b75e5c;hb=440baf2d4f88579609615c6cbf598c336fb07445;hp=ee8a506a3092b5299fced3770c5b9d8161742e3f;hpb=878638b5b594ec6c3e8b2310f7d31435c5935ef2;p=sbcl.git

diff --git a/src/assembly/x86/assem-rtns.lisp b/src/assembly/x86/assem-rtns.lisp
index ee8a506..9efecb9 100644
--- a/src/assembly/x86/assem-rtns.lisp
+++ b/src/assembly/x86/assem-rtns.lisp
@@ -39,8 +39,13 @@
   (inst cmp ecx (fixnumize 3))
   (inst jmp :e THREE-VALUES)
 
-  (inst mov ebx ebp-tn)
-  ;; Save the count, because the loop is going to destroy it.
+  ;; As per the calling convention EBX is expected to point at the SP
+  ;; before the stack frame.
+  (inst lea ebx (make-ea :dword :base ebp-tn
+                         :disp (* sp->fp-offset n-word-bytes)))
+
+  ;; Save the count, the return address and restore the frame pointer,
+  ;; because the loop is going to destroy them.
   (inst mov edx ecx)
   (inst mov eax (make-ea :dword :base ebp-tn
                          :disp (frame-byte-offset return-pc-save-offset)))
@@ -78,13 +83,12 @@
 
   ;; Handle the register arg cases.
   ZERO-VALUES
-  (inst mov ebx ebp-tn)
+  (inst lea ebx (make-ea :dword :base ebp-tn
+                         :disp (* sp->fp-offset n-word-bytes)))
   (inst mov edx nil-value)
   (inst mov edi edx)
   (inst mov esi edx)
-  (inst lea esp-tn
-        (make-ea :dword :base ebx
-                 :disp (frame-byte-offset ocfp-save-offset)))
+  (inst mov esp-tn ebp-tn)
   (inst stc)
   (inst pop ebp-tn)
   (inst ret)
@@ -93,33 +97,29 @@
   ;; check for this case when size > speed.
   ONE-VALUE
   (loadw edx esi -1)
-  (inst lea esp-tn
-        (make-ea :dword :base ebp-tn
-                 :disp (frame-byte-offset ocfp-save-offset)))
+  (inst mov esp-tn ebp-tn)
   (inst clc)
   (inst pop ebp-tn)
   (inst ret)
 
   TWO-VALUES
-  (inst mov ebx ebp-tn)
+  (inst lea ebx (make-ea :dword :base ebp-tn
+                         :disp (* sp->fp-offset n-word-bytes)))
   (loadw edx esi -1)
   (loadw edi esi -2)
   (inst mov esi nil-value)
-  (inst lea esp-tn
-        (make-ea :dword :base ebx
-                 :disp (frame-byte-offset ocfp-save-offset)))
+  (inst mov esp-tn ebp-tn)
   (inst stc)
   (inst pop ebp-tn)
   (inst ret)
 
   THREE-VALUES
-  (inst mov ebx ebp-tn)
+  (inst lea ebx (make-ea :dword :base ebp-tn
+                         :disp (* sp->fp-offset n-word-bytes)))
   (loadw edx esi -1)
   (loadw edi esi -2)
   (loadw esi esi -3)
-  (inst lea esp-tn
-        (make-ea :dword :base ebx
-                 :disp (frame-byte-offset ocfp-save-offset)))
+  (inst mov esp-tn ebp-tn)
   (inst stc)
   (inst pop ebp-tn)
   (inst ret))
@@ -204,7 +204,7 @@
 
   ;; Clear most of the stack.
   (inst lea esp-tn
-        (make-ea :dword :base ebp-tn :disp (* -3 n-word-bytes)))
+        (make-ea :dword :base ebp-tn :disp (* (- sp->fp-offset 3) n-word-bytes)))
 
   ;; Push the return-pc so it looks like we just called.
   (pushw ebp-tn (frame-word-offset return-pc-save-offset))
@@ -213,7 +213,7 @@
   (inst jmp (make-ea-for-object-slot eax closure-fun-slot fun-pointer-lowtag)))
 
 (define-assembly-routine (throw
-                          (:return-style :none))
+                          (:return-style :raw))
                          ((:arg target (descriptor-reg any-reg) edx-offset)
                           (:arg start any-reg ebx-offset)
                           (:arg count any-reg ecx-offset)
@@ -225,8 +225,18 @@
 
   LOOP
 
-  (let ((error (generate-error-code nil 'unseen-throw-tag-error target)))
-    (inst or catch catch)               ; check for NULL pointer
+  (let ((error (gen-label)))
+    (assemble (*elsewhere*)
+      (emit-label error)
+
+      ;; Fake up a stack frame so that backtraces come out right.
+      (inst push ebp-tn)
+      (inst mov ebp-tn esp-tn)
+
+      (emit-error-break nil error-trap
+                        (error-number-or-lose 'unseen-throw-tag-error)
+                        (list target)))
+    (inst test catch catch)             ; check for NULL pointer
     (inst jmp :z error))
 
   (inst cmp target (make-ea-for-object-slot catch catch-block-tag-slot 0))
@@ -254,7 +264,7 @@
   (declare (ignore start count))
 
   (let ((error (generate-error-code nil 'invalid-unwind-error)))
-    (inst or block block)               ; check for NULL pointer
+    (inst test block block)             ; check for NULL pointer
     (inst jmp :z error))
 
   (load-tl-symbol-value uwp *current-unwind-protect-block*)
@@ -299,7 +309,7 @@
   (declare (ignore start count))
 
   (let ((error (generate-error-code nil 'invalid-unwind-error)))
-    (inst or block block)               ; check for NULL pointer
+    (inst test block block)             ; check for NULL pointer
     (inst jmp :z error))
 
   ;; Save all our registers, as we're about to clobber them.
@@ -328,7 +338,7 @@
   (inst push 0)
   (inst push 0)
   (inst push ecx-tn)
-  (inst call (make-fixup "RtlUnwind@16" :foreign)))
+  (inst call (make-fixup "RtlUnwind" :foreign)))
 
 ;; We want no VOP for this one and for it to only happen on Win32
 ;; targets.  Hence the following disaster.