Revert "fix sb-posix tests on OpenBSD"

[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..fbde8b6 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)
@@ -204,11 +205,13 @@
   (: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)