X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86-64%2Fchar.lisp;fp=src%2Fcompiler%2Fx86-64%2Fchar.lisp;h=b70458c3af85d118ecb681987cd1f7cf634a3bcc;hb=952d16ab5880823c1864eb9105bb269e2e00760d;hp=8e92290db807f1812bf0a76dbdbc573939ef5230;hpb=878638b5b594ec6c3e8b2310f7d31435c5935ef2;p=sbcl.git

diff --git a/src/compiler/x86-64/char.lisp b/src/compiler/x86-64/char.lisp
index 8e92290..b70458c 100644
--- a/src/compiler/x86-64/char.lisp
+++ b/src/compiler/x86-64/char.lisp
@@ -110,14 +110,14 @@
       (character-stack
        #!-sb-unicode
        (inst mov
-             ;; FIXME: naked 8 (should be... what?  n-register-bytes?
-             ;; n-word-bytes?  Dunno.
-             (make-ea :byte :base fp :disp (- (* (1+ (tn-offset y)) 8)))
+             ;; XXX: If the sb-unicode case needs to handle c-call,
+             ;; why does the non-unicode case not need to?
+             (make-ea :byte :base fp :disp (frame-byte-offset (tn-offset y)))
              x)
        #!+sb-unicode
        (if (= (tn-offset fp) esp-offset)
-           (storew x fp (tn-offset y)) ; c-call
-           (storew x fp (- (1+ (tn-offset y)))))))))
+           (storew x fp (tn-offset y))  ; c-call
+           (storew x fp (frame-word-offset (tn-offset y))))))))
 (define-move-vop move-character-arg :move-arg
   (any-reg character-reg) (character-reg))