X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fnlx.lisp;h=b31e635806d1fed1ad70e8a6a53c8993f7c85e62;hb=d6f9676ae94419cb5544c45821a8d31adbc1fbe8;hp=1447f4cebd8d129c41d3f3fdf8fca45316f69184;hpb=1a19da9ff50a45962fc2cf42c7a241a2ce97a364;p=sbcl.git

diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp
index 1447f4c..b31e635 100644
--- a/src/compiler/x86/nlx.lisp
+++ b/src/compiler/x86/nlx.lisp
@@ -83,8 +83,7 @@
             block catch-block-entry-pc-slot)
     #!+win32
     (progn
-      (inst fs-segment-prefix)
-      (inst mov temp (make-ea :dword :disp 0))
+      (inst mov temp (make-ea :dword :disp 0) :fs)
       (storew temp block unwind-block-next-seh-frame-slot))))
 
 ;;; like MAKE-UNWIND-BLOCK, except that we also store in the specified
@@ -104,8 +103,7 @@
             block catch-block-entry-pc-slot)
     #!+win32
     (progn
-      (inst fs-segment-prefix)
-      (inst mov temp (make-ea :dword :disp 0))
+      (inst mov temp (make-ea :dword :disp 0) :fs)
       (storew temp block unwind-block-next-seh-frame-slot))
     (storew tag block catch-block-tag-slot)
     (load-tl-symbol-value temp *current-catch-block*)
@@ -126,8 +124,7 @@
       (inst lea seh-frame
             (make-ea-for-object-slot new-uwp
                                      unwind-block-next-seh-frame-slot 0))
-      (inst fs-segment-prefix)
-      (inst mov (make-ea :dword :disp 0) seh-frame))
+      (inst mov (make-ea :dword :disp 0) seh-frame :fs))
     (store-tl-symbol-value new-uwp *current-unwind-protect-block* tls)))
 
 (define-vop (unlink-catch-block)
@@ -149,8 +146,7 @@
     #!+win32
     (progn
       (loadw seh-frame block unwind-block-next-seh-frame-slot)
-      (inst fs-segment-prefix)
-      (inst mov (make-ea :dword :disp 0) seh-frame))
+      (inst mov (make-ea :dword :disp 0) seh-frame :fs))
     (loadw block block unwind-block-current-uwp-slot)
     (store-tl-symbol-value block *current-unwind-protect-block* tls)))
 
@@ -177,28 +173,35 @@
              (loadw (tn-ref-tn values) start -1)
              (emit-label no-values)))
           (t
+           ;; FIXME: this is mostly copied from
+           ;; DEFAULT-UNKNOWN-VALUES.
            (collect ((defaults))
              (do ((i 0 (1+ i))
                   (tn-ref values (tn-ref-across tn-ref)))
                  ((null tn-ref))
                (let ((default-lab (gen-label))
-                     (tn (tn-ref-tn tn-ref)))
-                 (defaults (cons default-lab tn))
-
+                     (tn (tn-ref-tn tn-ref))
+                     (first-stack-arg-p (= i register-arg-count)))
+                 (defaults (cons default-lab (cons tn first-stack-arg-p)))
                  (inst cmp count (fixnumize i))
                  (inst jmp :le default-lab)
+                 (when first-stack-arg-p
+                   (storew edx-tn ebx-tn -1))
                  (sc-case tn
                    ((descriptor-reg any-reg)
-                    (loadw tn start (frame-word-offset i)))
+                    (loadw tn start (frame-word-offset (+ sp->fp-offset i))))
                    ((control-stack)
-                    (loadw move-temp start (frame-word-offset i))
+                    (loadw move-temp start
+                           (frame-word-offset (+ sp->fp-offset i)))
                     (inst mov tn move-temp)))))
              (let ((defaulting-done (gen-label)))
                (emit-label defaulting-done)
                (assemble (*elsewhere*)
-                 (dolist (def (defaults))
-                   (emit-label (car def))
-                   (inst mov (cdr def) nil-value))
+                 (dolist (default (defaults))
+                   (emit-label (car default))
+                   (when (cddr default)
+                     (inst push edx-tn))
+                   (inst mov (second default) nil-value))
                  (inst jmp defaulting-done))))))
     (inst mov esp-tn sp)))
 
@@ -232,7 +235,7 @@
     (move num ecx)
     (inst shr ecx word-shift)           ; word count for <rep movs>
     ;; If we got zero, we be done.
-    (inst jecxz done)
+    (inst jecxz DONE)
     ;; Copy them down.
     (inst std)
     (inst rep)
@@ -257,20 +260,20 @@
 (define-vop (unwind-to-frame-and-call)
     (:args (ofp :scs (descriptor-reg))
            (uwp :scs (descriptor-reg))
-           (function :scs (descriptor-reg)))
+           (function :scs (descriptor-reg) :to :load :target saved-function))
   (:arg-types system-area-pointer system-area-pointer t)
   (:temporary (:sc sap-reg) temp)
+  (:temporary (:sc descriptor-reg :offset ebx-offset) saved-function)
   (:temporary (:sc unsigned-reg :offset eax-offset) block)
   (:generator 22
     ;; Store the function into a non-stack location, since we'll be
     ;; unwinding the stack and destroying register contents before we
-    ;; use it.
-    (store-tl-symbol-value function
-                           *unwind-to-frame-function*
-                           temp)
+    ;; use it.  It turns out that EBX is preserved as part of the
+    ;; normal multiple-value handling of an unwind, so use that.
+    (move saved-function function)
 
     ;; Allocate space for magic UWP block.
-    (inst sub esp-tn unwind-block-size)
+    (inst sub esp-tn (* unwind-block-size n-word-bytes))
     ;; Set up magic catch / UWP block.
     (move block esp-tn)
     (loadw temp uwp sap-pointer-slot other-pointer-lowtag)
@@ -286,18 +289,19 @@
     (inst jmp (make-fixup 'unwind :assembly-routine))
     ENTRY-LABEL
 
-    ;; Load function from symbol
-    (load-tl-symbol-value block *unwind-to-frame-function*)
+    ;; Move our saved function to where we want it now.
+    (move block saved-function)
 
     ;; No parameters
     (inst xor ecx-tn ecx-tn)
 
     ;; Clear 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 -2)
+    (pushw ebp-tn (frame-word-offset return-pc-save-offset))
 
     ;; Call it
     (inst jmp (make-ea :dword :base block