Remove a workaround in bit-vector consets

[sbcl.git] / src / compiler / x86-64 / array.lisp

diff --git a/src/compiler/x86-64/array.lisp b/src/compiler/x86-64/array.lisp
index 26fd1a9..4923793 100644 (file)
--- a/src/compiler/x86-64/array.lisp
+++ b/src/compiler/x86-64/array.lisp
@@ -14,7 +14,7 @@
 
 ;; For use in constant indexing; we can't use INDEX since the displacement
 ;; field of an EA can't contain 64 bit values.
-(deftype low-index () '(signed-byte 29))
+(def!type low-index () '(signed-byte 29))
 
 ;;;; allocator for the array header
 
@@ -353,7 +353,7 @@
      (:args (object :scs (descriptor-reg))
             (index :scs (any-reg)))
      (:info offset)
-     (:arg-types simple-array-single-float positive-fixnum
+     (:arg-types simple-array-single-float tagged-num
                  (:constant (constant-displacement other-pointer-lowtag
                                                    4 vector-data-offset)))
      ,@(when use-temp '((:temporary (:sc unsigned-reg) dword-index)))
@@ -391,7 +391,7 @@
             (index :scs (any-reg))
             (value :scs (single-reg) :target result))
      (:info offset)
-     (:arg-types simple-array-single-float positive-fixnum
+     (:arg-types simple-array-single-float tagged-num
                  (:constant (constant-displacement other-pointer-lowtag
                                                    4 vector-data-offset))
                   single-float)
@@ -431,7 +431,7 @@
   (:args (object :scs (descriptor-reg))
          (index :scs (any-reg)))
   (:info offset)
-  (:arg-types simple-array-double-float positive-fixnum
+  (:arg-types simple-array-double-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 8 vector-data-offset)))
   (:results (value :scs (double-reg)))
@@ -462,7 +462,7 @@
          (index :scs (any-reg))
          (value :scs (double-reg) :target result))
   (:info offset)
-  (:arg-types simple-array-double-float positive-fixnum
+  (:arg-types simple-array-double-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 8 vector-data-offset))
               double-float)
@@ -501,7 +501,7 @@
   (:args (object :scs (descriptor-reg))
          (index :scs (any-reg)))
   (:info offset)
-  (:arg-types simple-array-complex-single-float positive-fixnum
+  (:arg-types simple-array-complex-single-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 8 vector-data-offset)))
   (:results (value :scs (complex-single-reg)))
@@ -532,7 +532,7 @@
          (index :scs (any-reg))
          (value :scs (complex-single-reg) :target result))
   (:info offset)
-  (:arg-types simple-array-complex-single-float positive-fixnum
+  (:arg-types simple-array-complex-single-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 8 vector-data-offset))
               complex-single-float)
@@ -568,7 +568,7 @@
   (:args (object :scs (descriptor-reg))
          (index :scs (any-reg)))
   (:info offset)
-  (:arg-types simple-array-complex-double-float positive-fixnum
+  (:arg-types simple-array-complex-double-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 16 vector-data-offset)))
   (:results (value :scs (complex-double-reg)))
@@ -599,7 +599,7 @@
          (index :scs (any-reg))
          (value :scs (complex-double-reg) :target result))
   (:info offset)
-  (:arg-types simple-array-complex-double-float positive-fixnum
+  (:arg-types simple-array-complex-double-float tagged-num
               (:constant (constant-displacement other-pointer-lowtag
                                                 16 vector-data-offset))
               complex-double-float)
@@ -637,82 +637,86 @@
                    (:byte 1)
                    (:word 2)
                    (:dword 4))))
-    `(progn
-      (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype))
-        (:translate data-vector-ref-with-offset)
-        (:policy :fast-safe)
-        (:args (object :scs (descriptor-reg))
-               (index :scs (unsigned-reg)))
-        (:info offset)
-        (:arg-types ,ptype positive-fixnum
-                    (:constant (constant-displacement other-pointer-lowtag
-                                                      ,n-bytes vector-data-offset)))
-        (:results (value :scs ,scs))
-        (:result-types ,type)
-        (:generator 5
-          (inst ,mov-inst value
-                (make-ea ,operand-size :base object :index index :scale ,n-bytes
-                         :disp (- (+ (* vector-data-offset n-word-bytes)
-                                     (* offset ,n-bytes))
-                                  other-pointer-lowtag)))))
-      (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype))
-        (:translate data-vector-ref-with-offset)
-        (:policy :fast-safe)
-        (:args (object :scs (descriptor-reg)))
-        (:info index offset)
-        (:arg-types ,ptype (:constant low-index)
-                    (:constant (constant-displacement other-pointer-lowtag
-                                                      ,n-bytes vector-data-offset)))
-        (:results (value :scs ,scs))
-        (:result-types ,type)
-        (:generator 4
-          (inst ,mov-inst value
-                (make-ea ,operand-size :base object
-                         :disp (- (+ (* vector-data-offset n-word-bytes)
-                                     (* ,n-bytes index)
-                                     (* ,n-bytes offset))
-                                  other-pointer-lowtag)))))
-      (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype))
-        (:translate data-vector-set-with-offset)
-        (:policy :fast-safe)
-        (:args (object :scs (descriptor-reg) :to (:eval 0))
-               (index :scs (unsigned-reg) :to (:eval 0))
-               (value :scs ,scs :target result))
-        (:info offset)
-        (:arg-types ,ptype positive-fixnum
-                    (:constant (constant-displacement other-pointer-lowtag
-                                                      ,n-bytes vector-data-offset))
-                    ,type)
-        (:results (result :scs ,scs))
-        (:result-types ,type)
-        (:generator 5
-          (inst mov (make-ea ,operand-size :base object :index index :scale ,n-bytes
-                             :disp (- (+ (* vector-data-offset n-word-bytes)
-                                         (* offset ,n-bytes))
-                                      other-pointer-lowtag))
-                (reg-in-size value ,operand-size))
-          (move result value)))
-
-      (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype))
-        (:translate data-vector-set-with-offset)
-        (:policy :fast-safe)
-        (:args (object :scs (descriptor-reg) :to (:eval 0))
-               (value :scs ,scs :target result))
-        (:info index offset)
-        (:arg-types ,ptype (:constant low-index)
-                    (:constant (constant-displacement other-pointer-lowtag
-                                                      ,n-bytes vector-data-offset))
-                    ,type)
-        (:results (result :scs ,scs))
-        (:result-types ,type)
-        (:generator 4
-          (inst mov (make-ea ,operand-size :base object
-                             :disp (- (+ (* vector-data-offset n-word-bytes)
-                                         (* ,n-bytes index)
-                                         (* ,n-bytes offset))
-                                      other-pointer-lowtag))
-                (reg-in-size value ,operand-size))
-          (move result value)))))))
+    (multiple-value-bind (index-sc scale)
+        (if (>= n-bytes (ash 1 n-fixnum-tag-bits))
+            (values 'any-reg (ash n-bytes (- n-fixnum-tag-bits)))
+            (values 'signed-reg n-bytes))
+      `(progn
+         (define-vop (,(symbolicate "DATA-VECTOR-REF-WITH-OFFSET/" ptype))
+           (:translate data-vector-ref-with-offset)
+           (:policy :fast-safe)
+           (:args (object :scs (descriptor-reg))
+                  (index :scs (,index-sc)))
+           (:info offset)
+           (:arg-types ,ptype tagged-num
+                       (:constant (constant-displacement other-pointer-lowtag
+                                                         ,n-bytes vector-data-offset)))
+           (:results (value :scs ,scs))
+           (:result-types ,type)
+           (:generator 5
+                       (inst ,mov-inst value
+                             (make-ea ,operand-size :base object :index index :scale ,scale
+                                      :disp (- (+ (* vector-data-offset n-word-bytes)
+                                                  (* offset ,n-bytes))
+                                               other-pointer-lowtag)))))
+         (define-vop (,(symbolicate "DATA-VECTOR-REF-C-WITH-OFFSET/" ptype))
+           (:translate data-vector-ref-with-offset)
+           (:policy :fast-safe)
+           (:args (object :scs (descriptor-reg)))
+           (:info index offset)
+           (:arg-types ,ptype (:constant low-index)
+                       (:constant (constant-displacement other-pointer-lowtag
+                                                         ,n-bytes vector-data-offset)))
+           (:results (value :scs ,scs))
+           (:result-types ,type)
+           (:generator 4
+                       (inst ,mov-inst value
+                             (make-ea ,operand-size :base object
+                                      :disp (- (+ (* vector-data-offset n-word-bytes)
+                                                  (* ,n-bytes index)
+                                                  (* ,n-bytes offset))
+                                               other-pointer-lowtag)))))
+         (define-vop (,(symbolicate "DATA-VECTOR-SET-WITH-OFFSET/" ptype))
+           (:translate data-vector-set-with-offset)
+           (:policy :fast-safe)
+           (:args (object :scs (descriptor-reg) :to (:eval 0))
+                  (index :scs (,index-sc) :to (:eval 0))
+                  (value :scs ,scs :target result))
+           (:info offset)
+           (:arg-types ,ptype tagged-num
+                       (:constant (constant-displacement other-pointer-lowtag
+                                                         ,n-bytes vector-data-offset))
+                       ,type)
+           (:results (result :scs ,scs))
+           (:result-types ,type)
+           (:generator 5
+                       (inst mov (make-ea ,operand-size :base object :index index :scale ,scale
+                                          :disp (- (+ (* vector-data-offset n-word-bytes)
+                                                      (* offset ,n-bytes))
+                                                   other-pointer-lowtag))
+                             (reg-in-size value ,operand-size))
+                       (move result value)))
+
+         (define-vop (,(symbolicate "DATA-VECTOR-SET-C-WITH-OFFSET/" ptype))
+           (:translate data-vector-set-with-offset)
+           (:policy :fast-safe)
+           (:args (object :scs (descriptor-reg) :to (:eval 0))
+                  (value :scs ,scs :target result))
+           (:info index offset)
+           (:arg-types ,ptype (:constant low-index)
+                       (:constant (constant-displacement other-pointer-lowtag
+                                                         ,n-bytes vector-data-offset))
+                       ,type)
+           (:results (result :scs ,scs))
+           (:result-types ,type)
+           (:generator 4
+                       (inst mov (make-ea ,operand-size :base object
+                                          :disp (- (+ (* vector-data-offset n-word-bytes)
+                                                      (* ,n-bytes index)
+                                                      (* ,n-bytes offset))
+                                                   other-pointer-lowtag))
+                             (reg-in-size value ,operand-size))
+                       (move result value))))))))
   (define-data-vector-frobs simple-array-unsigned-byte-7 movzx :byte
     positive-fixnum unsigned-reg signed-reg)
   (define-data-vector-frobs simple-array-unsigned-byte-8 movzx :byte
@@ -764,7 +768,8 @@
   (:result-types unsigned-num)
   (:generator 4
     (inst xadd (make-ea :qword :base array
-                        :scale 1 :index index
+                        :scale (ash 1 (- word-shift n-fixnum-tag-bits))
+                        :index index
                         :disp (- (* vector-data-offset n-word-bytes)
                                  other-pointer-lowtag))
           diff :lock)