X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fsap.lisp;h=e6c39c58d35e1d458f3d7b846bac874151f24028;hb=ffa9a31f62e3e2abab8ebcbb3bfdab9725feaf7f;hp=66c3e30dc5afde294501228229802a414a987231;hpb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;p=sbcl.git

diff --git a/src/compiler/alpha/sap.lisp b/src/compiler/alpha/sap.lisp
index 66c3e30..e6c39c5 100644
--- a/src/compiler/alpha/sap.lisp
+++ b/src/compiler/alpha/sap.lisp
@@ -52,7 +52,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)
@@ -64,12 +64,12 @@
        (move x y))
       (sap-stack
        (storeq x fp (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
@@ -219,7 +219,10 @@
                                     (:single
                                      '((inst lds result offset object)))
                                     (:double
-                                     '((inst ldt result (+ offset word-bytes) object))))))
+                                     '((inst ldt
+					     result
+					     (+ offset n-word-bytes)
+					     object))))))
                   (define-vop (,set-name)
                     (:translate ,set-name)
                     (:policy :fast-safe)
@@ -351,5 +354,5 @@
   (:result-types system-area-pointer)
   (:generator 2
     (inst lda sap
-	  (- (* vector-data-offset word-bytes) other-pointer-lowtag)
+	  (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
 	  vector)))