X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fsap.lisp;h=c834de3b65ba8acaf8eba9dbd89c6e564c966e35;hb=b05ccdd91520249de6b465e226d3708089e541dc;hp=6eebdc6fdb39b20d36ec9ccd7fc960df9a0e9243;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git

diff --git a/src/compiler/x86/sap.lisp b/src/compiler/x86/sap.lisp
index 6eebdc6..c834de3 100644
--- a/src/compiler/x86/sap.lisp
+++ b/src/compiler/x86/sap.lisp
@@ -51,7 +51,7 @@
   (sap-reg) (sap-reg))
 
 ;;; Move untagged sap arguments/return-values.
-(define-vop (move-sap-argument)
+(define-vop (move-sap-arg)
   (:args (x :target y
 	    :scs (sap-reg))
 	 (fp :scs (any-reg)
@@ -66,12 +66,12 @@
        (if (= (tn-offset fp) esp-offset)
 	   (storew x fp (tn-offset y))	; c-call
 	   (storew x fp (- (1+ (tn-offset y)))))))))
-(define-move-vop move-sap-argument :move-argument
+(define-move-vop move-sap-arg :move-arg
   (descriptor-reg sap-reg) (sap-reg))
 
-;;; Use standard MOVE-ARGUMENT + coercion to move an untagged sap to a
+;;; Use standard MOVE-ARG + coercion to move an untagged sap to a
 ;;; descriptor passing location.
-(define-move-vop move-argument :move-argument
+(define-move-vop move-arg :move-arg
   (sap-reg) (descriptor-reg))
 
 ;;;; SAP-INT and INT-SAP
@@ -496,4 +496,6 @@
   (:result-types system-area-pointer)
   (:generator 2
     (move sap vector)
-    (inst add sap (- (* vector-data-offset word-bytes) other-pointer-lowtag))))
+    (inst add
+	  sap
+	  (- (* vector-data-offset n-word-bytes) other-pointer-lowtag))))