Let OFFSET-CONFLICTS-IN-SB check multiple offsets at a time

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

diff --git a/src/compiler/x86-64/alloc.lisp b/src/compiler/x86-64/alloc.lisp
index 22b18a3..74c49e8 100644 (file)
--- a/src/compiler/x86-64/alloc.lisp
+++ b/src/compiler/x86-64/alloc.lisp
@@ -79,9 +79,10 @@
               positive-fixnum)
   (:policy :fast-safe)
   (:generator 100
-    (inst lea result (make-ea :byte :base words :disp
-                              (+ (1- (ash 1 n-lowtag-bits))
-                                 (* vector-data-offset n-word-bytes))))
+    (inst lea result (make-ea :byte :index words
+                              :scale (ash 1 (- word-shift n-fixnum-tag-bits))
+                              :disp (+ lowtag-mask
+                                       (* vector-data-offset n-word-bytes))))
     (inst and result (lognot lowtag-mask))
     (pseudo-atomic
       (allocation result result)
@@ -90,12 +91,12 @@
       (storew length result vector-length-slot other-pointer-lowtag))))
 
 (define-vop (allocate-vector-on-stack)
-  (:args (type :scs (unsigned-reg))
-         (length :scs (any-reg))
+  (:args (type :scs (unsigned-reg) :to :save)
+         (length :scs (any-reg) :to :eval :target zero)
          (words :scs (any-reg) :target ecx))
   (:temporary (:sc any-reg :offset ecx-offset :from (:argument 2)) ecx)
-  (:temporary (:sc any-reg :offset eax-offset :from (:argument 2)) zero)
-  (:temporary (:sc any-reg :offset edi-offset :from (:argument 0)) res)
+  (:temporary (:sc any-reg :offset eax-offset :from :eval) zero)
+  (:temporary (:sc any-reg :offset edi-offset) res)
   (:results (result :scs (descriptor-reg) :from :load))
   (:arg-types positive-fixnum
               positive-fixnum
@@ -104,9 +105,10 @@
   (:policy :fast-safe)
   (:node-var node)
   (:generator 100
-    (inst lea result (make-ea :byte :base words :disp
-                              (+ (1- (ash 1 n-lowtag-bits))
-                                 (* vector-data-offset n-word-bytes))))
+    (inst lea result (make-ea :byte :index words
+                              :scale (ash 1 (- word-shift n-fixnum-tag-bits))
+                              :disp (+ lowtag-mask
+                                       (* vector-data-offset n-word-bytes))))
     (inst and result (lognot lowtag-mask))
     ;; FIXME: It would be good to check for stack overflow here.
     (move ecx words)
@@ -122,7 +124,6 @@
     (inst rep)
     (inst stos zero)))
 
-(in-package "SB!VM")
 \f
 (define-vop (make-fdefn)
   (:policy :fast-safe)
@@ -168,7 +169,7 @@
 
 (define-vop (make-unbound-marker)
   (:args)
-  (:results (result :scs (any-reg)))
+  (:results (result :scs (descriptor-reg any-reg)))
   (:generator 1
     (inst mov result unbound-marker-widetag)))
 
@@ -176,7 +177,7 @@
   (:args)
   (:results (result :scs (any-reg)))
   (:generator 1
-    (inst lea result (make-fixup "funcallable_instance_tramp" :foreign))))
+    (inst mov result (make-fixup "funcallable_instance_tramp" :foreign))))
 
 (define-vop (fixed-alloc)
   (:args)
@@ -204,50 +205,15 @@
   (:node-var node)
   (:generator 50
     (inst lea bytes
-          (make-ea :qword :base extra :disp (* (1+ words) n-word-bytes)))
+          (make-ea :qword :disp (* (1+ words) n-word-bytes) :index extra
+                   :scale (ash 1 (- word-shift n-fixnum-tag-bits))))
     (inst mov header bytes)
-    (inst shl header (- n-widetag-bits 3)) ; w+1 to length field
+    (inst shl header (- n-widetag-bits word-shift)) ; w+1 to length field
     (inst lea header                    ; (w-1 << 8) | type
-          (make-ea :qword :base header :disp (+ (ash -2 n-widetag-bits) type)))
+          (make-ea :qword :base header
+                   :disp (+ (ash -2 n-widetag-bits) type)))
     (inst and bytes (lognot lowtag-mask))
     (pseudo-atomic
      (allocation result bytes node)
      (inst lea result (make-ea :byte :base result :disp lowtag))
      (storew header result 0 lowtag))))
-
-(define-vop (%make-symbol)
-  (:policy :fast-safe)
-  (:translate %make-symbol)
-  (:args (name :scs (descriptor-reg) :to :eval))
-  (:temporary (:sc unsigned-reg :from :eval) temp)
-  (:results (result :scs (descriptor-reg) :from :argument))
-  (:node-var node)
-  (:generator 37
-    (with-fixed-allocation (result symbol-header-widetag symbol-size node)
-      (storew name result symbol-name-slot other-pointer-lowtag)
-      (storew unbound-marker-widetag
-              result
-              symbol-value-slot
-              other-pointer-lowtag)
-      ;; Set up a random hash value for the symbol. Perhaps the object
-      ;; address could be used for even faster and smaller code!
-      ;; FIXME: We don't mind the symbol hash not being repeatable, so
-      ;; we might as well add in the object address here, too. (Adding entropy
-      ;; is good, even if ANSI doesn't understand that.)
-      (inst imul temp
-            (make-fixup "fast_random_state" :foreign)
-            1103515245)
-      (inst add temp 12345)
-      (inst mov (make-fixup "fast_random_state" :foreign)
-            temp)
-      ;; We want a positive fixnum for the hash value, so discard the LS bits.
-      ;;
-      ;; FIXME: OK, who wants to tell me (CSR) why these two
-      ;; instructions aren't replaced by (INST AND TEMP #x8FFFFFFC)?
-      ;; Are the following two instructions actually faster?  Does the
-      ;; difference in behaviour really matter?
-      (inst shr temp 1)
-      (inst and temp #xfffffffc)
-      (storew temp result symbol-hash-slot other-pointer-lowtag)
-      (storew nil-value result symbol-plist-slot other-pointer-lowtag)
-      (storew nil-value result symbol-package-slot other-pointer-lowtag))))