X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fnlx.lisp;h=96d2ca4c4f3421f5dcedd6290c1863edbd102959;hb=9510443d0bd00fcbd0213e07a5340e66d9ce7301;hp=07d403206a96b933a0cc2e6aa3372de0ac41f956;hpb=878638b5b594ec6c3e8b2310f7d31435c5935ef2;p=sbcl.git

diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp
index 07d4032..96d2ca4 100644
--- a/src/compiler/x86/nlx.lisp
+++ b/src/compiler/x86/nlx.lisp
@@ -189,9 +189,10 @@
                    (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)
@@ -296,7 +297,8 @@
 
     ;; 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 (frame-word-offset return-pc-save-offset))