1.0.16.35: improved TIME output

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

diff --git a/src/compiler/mips/array.lisp b/src/compiler/mips/array.lisp
index 9137ad9..801172b 100644 (file)
--- a/src/compiler/mips/array.lisp
+++ b/src/compiler/mips/array.lisp
@@ -30,7 +30,7 @@
     (inst addu header rank (fixnumize (1- array-dimensions-offset)))
     (inst sll header n-widetag-bits)
     (inst or header header type)
-    (inst srl header 2)
+    (inst srl header n-fixnum-tag-bits)
     (pseudo-atomic (pa-flag)
       (inst or result alloc-tn other-pointer-lowtag)
       (storew header result 0 other-pointer-lowtag)
@@ -55,7 +55,7 @@
     (loadw temp x 0 other-pointer-lowtag)
     (inst sra temp n-widetag-bits)
     (inst subu temp (1- array-dimensions-offset))
-    (inst sll res temp 2)))
+    (inst sll res temp n-fixnum-tag-bits)))
 \f
 ;;;; Bounds checking routine.
 (define-vop (check-bound)
@@ -138,13 +138,13 @@
   (def-full-data-vector-frobs simple-array-signed-byte-32 signed-num
     signed-reg))
 
-;;; Integer vectors whos elements are smaller than a byte.  I.e. bit, 2-bit,
+;;; Integer vectors whose elements are smaller than a byte.  I.e. bit, 2-bit,
 ;;; and 4-bit vectors.
 (macrolet ((def-small-data-vector-frobs (type 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))
+       (define-vop (,(symbolicate 'DATA-VECTOR-REF/ type))
          (:note "inline array access")
          (:translate data-vector-ref)
          (:policy :fast-safe)
@@ -157,7 +157,7 @@
          (:temporary (:scs (non-descriptor-reg) :to (:result 0)) temp result)
          (:generator 20
            (inst srl temp index ,bit-shift)
-           (inst sll temp 2)
+           (inst sll temp n-fixnum-tag-bits)
            (inst addu lip object temp)
            (inst lw result lip
                  (- (* vector-data-offset n-word-bytes)
@@ -169,8 +169,8 @@
                `((inst sll temp ,(1- (integer-length bits)))))
            (inst srl result temp)
            (inst and result ,(1- (ash 1 bits)))
-           (inst sll value result 2)))
-       (define-vop (,(symbolicate 'data-vector-ref-c/ type))
+           (inst sll value result n-fixnum-tag-bits)))
+       (define-vop (,(symbolicate 'DATA-VECTOR-REF-C/ type))
          (:translate data-vector-ref)
          (:policy :fast-safe)
          (:args (object :scs (descriptor-reg)))
@@ -195,7 +195,7 @@
                (inst srl result (* extra ,bits)))
              (unless (= extra ,(1- elements-per-word))
                (inst and result ,(1- (ash 1 bits)))))))
-       (define-vop (,(symbolicate 'data-vector-set/ type))
+       (define-vop (,(symbolicate 'DATA-VECTOR-SET/ type))
          (:note "inline array store")
          (:translate data-vector-set)
          (:policy :fast-safe)
@@ -210,7 +210,7 @@
          (:temporary (:scs (non-descriptor-reg) :from (:argument 1)) shift)
          (:generator 25
            (inst srl temp index ,bit-shift)
-           (inst sll temp 2)
+           (inst sll temp n-fixnum-tag-bits)
            (inst addu lip object temp)
            (inst lw old lip
                  (- (* vector-data-offset n-word-bytes)
@@ -244,7 +244,7 @@
               (move result zero-tn))
              (unsigned-reg
               (move result value)))))
-       (define-vop (,(symbolicate 'data-vector-set-c/ type))
+       (define-vop (,(symbolicate 'DATA-VECTOR-SET-C/ type))
          (:translate data-vector-set)
          (:policy :fast-safe)
          (:args (object :scs (descriptor-reg))
@@ -470,7 +470,7 @@
   (:temporary (:scs (interior-reg)) lip)
   (:temporary (:scs (any-reg) :from (:argument 1)) shift)
   (:generator 6
-    (inst sll shift index 2)
+    (inst sll shift index n-fixnum-tag-bits)
     (inst addu lip object shift)
     (let ((real-tn (complex-double-reg-real-tn value)))
       (ld-double real-tn lip (- (* vector-data-offset n-word-bytes)
@@ -494,7 +494,7 @@
   (:temporary (:scs (interior-reg)) lip)
   (:temporary (:scs (any-reg) :from (:argument 1)) shift)
   (:generator 6
-    (inst sll shift index 2)
+    (inst sll shift index n-fixnum-tag-bits)
     (inst addu lip object shift)
     (let ((value-real (complex-double-reg-real-tn value))
           (result-real (complex-double-reg-real-tn result)))
@@ -510,37 +510,6 @@
         (inst fmove :double result-imag value-imag)))))
 
 \f
-;;; These VOPs are used for implementing float slots in structures (whose raw
-;;; data is an unsigned-32 vector.
-(define-vop (raw-ref-single data-vector-ref/simple-array-single-float)
-  (:translate %raw-ref-single)
-  (:arg-types sb!c::raw-vector positive-fixnum))
-(define-vop (raw-set-single data-vector-set/simple-array-single-float)
-  (:translate %raw-set-single)
-  (:arg-types sb!c::raw-vector positive-fixnum single-float))
-(define-vop (raw-ref-double data-vector-ref/simple-array-double-float)
-  (:translate %raw-ref-double)
-  (:arg-types sb!c::raw-vector positive-fixnum))
-(define-vop (raw-set-double data-vector-set/simple-array-double-float)
-  (:translate %raw-set-double)
-  (:arg-types sb!c::raw-vector positive-fixnum double-float))
-(define-vop (raw-ref-complex-single
-             data-vector-ref/simple-array-complex-single-float)
-  (:translate %raw-ref-complex-single)
-  (:arg-types sb!c::raw-vector positive-fixnum))
-(define-vop (raw-set-complex-single
-             data-vector-set/simple-array-complex-single-float)
-  (:translate %raw-set-complex-single)
-  (:arg-types sb!c::raw-vector positive-fixnum complex-single-float))
-(define-vop (raw-ref-complex-double
-             data-vector-ref/simple-array-complex-double-float)
-  (:translate %raw-ref-complex-double)
-  (:arg-types sb!c::raw-vector positive-fixnum))
-(define-vop (raw-set-complex-double
-             data-vector-set/simple-array-complex-double-float)
-  (:translate %raw-set-complex-double)
-  (:arg-types sb!c::raw-vector positive-fixnum complex-double-float))
-
 ;;; These vops are useful for accessing the bits of a vector irrespective of
 ;;; what type of vector it is.
 (define-full-reffer raw-bits * 0 other-pointer-lowtag (unsigned-reg) unsigned-num