0.pre7.124:

[sbcl.git] / src / compiler / alpha / array.lisp

diff --git a/src/compiler/alpha/array.lisp b/src/compiler/alpha/array.lisp
index 0250c2b..ab99060 100644 (file)
--- a/src/compiler/alpha/array.lisp
+++ b/src/compiler/alpha/array.lisp
@@ -23,13 +23,13 @@
   (:temporary (:scs (non-descriptor-reg)) header)
   (:results (result :scs (descriptor-reg)))
   (:generator 13
-    (inst addq rank (+ (* array-dimensions-offset word-bytes)
+    (inst addq rank (+ (* array-dimensions-offset n-word-bytes)
                       lowtag-mask)
          bytes)
     (inst li (lognot lowtag-mask) header)
     (inst and bytes header bytes)
     (inst addq rank (fixnumize (1- array-dimensions-offset)) header)
-    (inst sll header type-bits header)
+    (inst sll header n-widetag-bits header)
     (inst bis header type header)
     (inst srl header 2 header)
     (pseudo-atomic ()
@@ -65,7 +65,7 @@
   (:results (res :scs (any-reg descriptor-reg)))
   (:generator 6
     (loadw temp x 0 other-pointer-lowtag)
-    (inst sra temp type-bits temp)
+    (inst sra temp n-widetag-bits temp)
     (inst subq temp (1- array-dimensions-offset) temp)
     (inst sll temp 2 res)))
 
@@ -100,7 +100,7 @@
                 (define-full-reffer ,(symbolicate "DATA-VECTOR-REF/" type)
                  ,type
                   vector-data-offset other-pointer-lowtag
-                  ,(remove-if #'(lambda (x) (member x '(null zero))) scs)
+                  ,(remove-if (lambda (x) (member x '(null zero))) scs)
                   ,element-type
                   data-vector-ref)
                 (define-full-setter ,(symbolicate "DATA-VECTOR-SET/" type)
@@ -122,7 +122,7 @@
                   ,size vector-data-offset other-pointer-lowtag ,scs
                   ,element-type data-vector-set)))
            (def-small-data-vector-frobs (type bits)
-             (let* ((elements-per-word (floor word-bits bits))
+             (let* ((elements-per-word (floor n-word-bits bits))
                     (bit-shift (1- (integer-length elements-per-word))))
                `(progn
                   (define-vop (,(symbolicate 'data-vector-ref/ type))
@@ -142,7 +142,7 @@
                                 (inst sll temp 2 temp)
                                 (inst addq object temp lip)
                                 (inst ldl result
-                                      (- (* vector-data-offset word-bytes)
+                                      (- (* vector-data-offset n-word-bytes)
                                          other-pointer-lowtag)
                                       lip)
                                 (inst and index ,(1- elements-per-word) temp)
@@ -161,7 +161,7 @@
                                  (integer 0
                                           ,(1- (* (1+ (- (floor (+ #x7fff
                                                                    other-pointer-lowtag)
-                                                                word-bytes)
+                                                                n-word-bytes)
                                                          vector-data-offset))
                                                   elements-per-word)))))
                     (:info index)
@@ -198,7 +198,7 @@
                                 (inst sll temp 2 temp)
                                 (inst addq object temp lip)
                                 (inst ldl old
-                                      (- (* vector-data-offset word-bytes)
+                                      (- (* vector-data-offset n-word-bytes)
                                          other-pointer-lowtag)
                                       lip)
                                 (inst and index ,(1- elements-per-word) shift)
@@ -227,7 +227,7 @@
                                   (inst sll temp shift temp)
                                   (inst bis old temp old))
                                 (inst stl old
-                                      (- (* vector-data-offset word-bytes)
+                                      (- (* vector-data-offset n-word-bytes)
                                          other-pointer-lowtag)
                                       lip)
                                 (sc-case value
@@ -248,7 +248,7 @@
                                  (integer 0
                                           ,(1- (* (1+ (- (floor (+ #x7fff
                                                                    other-pointer-lowtag)
-                                                                word-bytes)
+                                                                n-word-bytes)
                                                          vector-data-offset))
                                                   elements-per-word))))
                                 positive-fixnum)
@@ -261,7 +261,7 @@
                                    (floor index ,elements-per-word)
                                   (inst ldl object
                                         (- (* (+ word vector-data-offset)
-                                             word-bytes)
+                                             n-word-bytes)
                                            other-pointer-lowtag)
                                         old)
                                   (unless (and (sc-is value immediate)
@@ -298,7 +298,7 @@
                                             (inst bis old temp old)))
                                   (inst stl old
                                         (- (* (+ word vector-data-offset)
-                                             word-bytes)
+                                             n-word-bytes)
                                            other-pointer-lowtag)
                                         object)
                                   (sc-case value
@@ -355,7 +355,7 @@
   (:generator 20
     (inst addq object index lip)
     (inst lds value
-         (- (* vector-data-offset word-bytes)
+         (- (* vector-data-offset n-word-bytes)
             other-pointer-lowtag)
           lip)))
 
@@ -373,7 +373,7 @@
   (:generator 20
     (inst addq object index lip)
     (inst sts value
-         (- (* vector-data-offset word-bytes)
+         (- (* vector-data-offset n-word-bytes)
             other-pointer-lowtag)
          lip)
     (unless (location= result value)
@@ -393,7 +393,7 @@
     (inst addq object index lip)
     (inst addq lip index lip)
     (inst ldt value
-         (- (* vector-data-offset word-bytes)
+         (- (* vector-data-offset n-word-bytes)
             other-pointer-lowtag)
          lip)))
 
@@ -412,7 +412,7 @@
     (inst addq object index lip)
     (inst addq lip index lip)
     (inst stt value
-         (- (* vector-data-offset word-bytes)
+         (- (* vector-data-offset n-word-bytes)
             other-pointer-lowtag) lip)
     (unless (location= result value)
       (inst fmove value result))))
@@ -434,11 +434,11 @@
       (inst addq object index lip)
       (inst addq lip index lip)
       (inst lds real-tn
-           (- (* vector-data-offset word-bytes) other-pointer-lowtag)
+           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
            lip))
     (let ((imag-tn (complex-single-reg-imag-tn value)))
       (inst lds imag-tn
-           (- (* (1+ vector-data-offset) word-bytes) other-pointer-lowtag)
+           (- (* (1+ vector-data-offset) n-word-bytes) other-pointer-lowtag)
            lip))))
 
 (define-vop (data-vector-set/simple-array-complex-single-float)
@@ -459,14 +459,14 @@
       (inst addq object index lip)
       (inst addq lip index lip)
       (inst sts value-real
-           (- (* vector-data-offset word-bytes) other-pointer-lowtag)
+           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
            lip)
       (unless (location= result-real value-real)
        (inst fmove value-real result-real)))
     (let ((value-imag (complex-single-reg-imag-tn value))
          (result-imag (complex-single-reg-imag-tn result)))
       (inst sts value-imag
-           (- (* (1+ vector-data-offset) word-bytes) other-pointer-lowtag)
+           (- (* (1+ vector-data-offset) n-word-bytes) other-pointer-lowtag)
            lip)
       (unless (location= result-imag value-imag)
        (inst fmove value-imag result-imag)))))
@@ -488,11 +488,11 @@
       (inst addq lip index lip)
       (inst addq lip index lip)
       (inst ldt real-tn
-           (- (* vector-data-offset word-bytes) other-pointer-lowtag)
+           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
            lip))
     (let ((imag-tn (complex-double-reg-imag-tn value)))
       (inst ldt imag-tn
-           (- (* (+ vector-data-offset 2) word-bytes) other-pointer-lowtag)
+           (- (* (+ vector-data-offset 2) n-word-bytes) other-pointer-lowtag)
            lip))))
 
 (define-vop (data-vector-set/simple-array-complex-double-float)
@@ -515,14 +515,14 @@
       (inst addq lip index lip)
       (inst addq lip index lip)
       (inst stt value-real
-           (- (* vector-data-offset word-bytes) other-pointer-lowtag)
+           (- (* vector-data-offset n-word-bytes) other-pointer-lowtag)
            lip)
       (unless (location= result-real value-real)
        (inst fmove value-real result-real)))
     (let ((value-imag (complex-double-reg-imag-tn value))
          (result-imag (complex-double-reg-imag-tn result)))
       (inst stt value-imag
-           (- (* (+ vector-data-offset 2) word-bytes) other-pointer-lowtag)
+           (- (* (+ vector-data-offset 2) n-word-bytes) other-pointer-lowtag)
            lip)
       (unless (location= result-imag value-imag)
        (inst fmove value-imag result-imag)))))