1.0.23.67: Fix MIPS FIXED-ALLOC VOP.

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

diff --git a/src/compiler/mips/alloc.lisp b/src/compiler/mips/alloc.lisp
index fdca339..4c37b2c 100644 (file)
--- a/src/compiler/mips/alloc.lisp
+++ b/src/compiler/mips/alloc.lisp
@@ -77,6 +77,61 @@
 \f
 ;;;; Special purpose inline allocators.
 
+;;; ALLOCATE-VECTOR
+(define-vop (allocate-vector-on-heap)
+  (:args (type :scs (unsigned-reg))
+         (length :scs (any-reg))
+         (words :scs (any-reg)))
+  (:arg-types positive-fixnum
+              positive-fixnum
+              positive-fixnum)
+  (:temporary (:sc non-descriptor-reg) bytes)
+  (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag)
+  (:results (result :scs (descriptor-reg) :from :load))
+  (:policy :fast-safe)
+  (:generator 100
+    (inst addu bytes words (+ lowtag-mask
+                              (* vector-data-offset n-word-bytes)))
+    (inst srl bytes n-lowtag-bits)
+    (inst sll bytes n-lowtag-bits)
+    (pseudo-atomic (pa-flag)
+      (inst or result alloc-tn other-pointer-lowtag)
+      (inst addu alloc-tn bytes)
+      (storew type result 0 other-pointer-lowtag)
+      (storew length result vector-length-slot other-pointer-lowtag))))
+
+(define-vop (allocate-vector-on-stack)
+  (:args (type :scs (unsigned-reg))
+         (length :scs (any-reg))
+         (words :scs (any-reg)))
+  (:arg-types positive-fixnum
+              positive-fixnum
+              positive-fixnum)
+  (:temporary (:sc non-descriptor-reg) bytes)
+  (:temporary (:sc non-descriptor-reg) temp)
+  (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag)
+  (:results (result :scs (descriptor-reg) :from :load))
+  (:policy :fast-safe)
+  (:generator 100
+    (inst addu bytes words (+ lowtag-mask
+                              (* vector-data-offset n-word-bytes)))
+    (inst srl bytes n-lowtag-bits)
+    (inst sll bytes n-lowtag-bits)
+    ;; FIXME: It would be good to check for stack overflow here.
+    (pseudo-atomic (pa-flag)
+      (align-csp temp)
+      (inst or result csp-tn other-pointer-lowtag)
+      (inst addu temp csp-tn (* vector-data-offset n-word-bytes))
+      (inst addu csp-tn bytes)
+      (storew type result 0 other-pointer-lowtag)
+      (storew length result vector-length-slot other-pointer-lowtag)
+      (let ((loop (gen-label)))
+        (emit-label loop)
+        (storew zero-tn temp 0)
+        (inst bne temp csp-tn loop)
+        (inst addu temp n-word-bytes))
+      (align-csp temp))))
+
 (define-vop (allocate-code-object)
   (:args (boxed-arg :scs (any-reg))
          (unboxed-arg :scs (any-reg)))
@@ -171,13 +226,25 @@
 (define-vop (fixed-alloc)
   (:args)
   (:info name words type lowtag stack-allocate-p)
-  (:ignore name stack-allocate-p)
+  (:ignore name)
   (:results (result :scs (descriptor-reg)))
   (:temporary (:scs (non-descriptor-reg)) temp)
   (:temporary (:sc non-descriptor-reg :offset nl4-offset) pa-flag)
   (:generator 4
-    (pseudo-atomic (pa-flag :extra (pad-data-block words))
-      (inst or result alloc-tn lowtag)
+    (pseudo-atomic (pa-flag :extra (if stack-allocate-p
+                                       0
+                                       (pad-data-block words)))
+      (cond (stack-allocate-p
+             (align-csp result)
+             (inst or result csp-tn lowtag)
+             (inst addu csp-tn (pad-data-block words)))
+            (t
+             ;; The pseudo-atomic bit in alloc-tn is set.  If the
+             ;; lowtag also has a 1 bit in the same position, we're all
+             ;; set.  Otherwise, we need to subtract the pseudo-atomic
+             ;; bit.
+             (inst or result alloc-tn (if (logbitp 0 lowtag) lowtag
+                                                             (1- lowtag)))))
       (when type
         (inst li temp (logior (ash (1- words) n-widetag-bits) type))
         (storew temp result 0 lowtag)))))