0.9.0.22: more fixed allocation

[sbcl.git] / src / compiler / ppc / values.lisp

diff --git a/src/compiler/ppc/values.lisp b/src/compiler/ppc/values.lisp
index 230a13b..36cbd5b 100644 (file)
--- a/src/compiler/ppc/values.lisp
+++ b/src/compiler/ppc/values.lisp
@@ -11,6 +11,61 @@
   (:generator 1
     (move csp-tn ptr)))
 
+(define-vop (%%pop-dx)
+  (:args (ptr :scs (any-reg)))
+  (:ignore ptr)
+  (:generator 1
+    (bug "VOP %%POP-DX is not implemented.")))
+
+(define-vop (%%nip-dx)
+  (:args (last-nipped-ptr :scs (any-reg) :target dest)
+        (last-preserved-ptr :scs (any-reg) :target src)
+        (moved-ptrs :scs (any-reg) :more t))
+  (:results (r-moved-ptrs :scs (any-reg) :more t))
+  (:temporary (:sc any-reg) src)
+  (:temporary (:sc any-reg) dest)
+  (:temporary (:sc non-descriptor-reg) temp)
+  (:ignore r-moved-ptrs
+           last-nipped-ptr last-preserved-ptr moved-ptrs
+           src dest temp)
+  (:generator 1
+    (bug "VOP %%NIP-DX is not implemented.")))
+
+;;; sparc version translated to ppc by David Steuber with help from #lisp.
+(define-vop (%%nip-values)
+  (:args (last-nipped-ptr :scs (any-reg) :target dest)
+         (last-preserved-ptr :scs (any-reg) :target src)
+         (moved-ptrs :scs (any-reg) :more t))
+  (:results (r-moved-ptrs :scs (any-reg) :more t))
+  (:temporary (:sc any-reg) src)
+  (:temporary (:sc any-reg) dest)
+  (:temporary (:sc non-descriptor-reg) temp)
+  (:ignore r-moved-ptrs)
+  (:generator 1
+    (inst mr dest last-nipped-ptr)
+    (inst mr src last-preserved-ptr)
+    (inst cmplw csp-tn src)
+    (inst ble DONE)
+    LOOP
+    (loadw temp src)
+    (inst addi dest dest n-word-bytes)
+    (inst addi src src n-word-bytes)
+    (storew temp dest -1)
+    (inst cmplw csp-tn src)
+    (inst bgt LOOP)
+    DONE
+    (inst mr csp-tn dest)
+    (inst sub src src dest)
+    (loop for moved = moved-ptrs then (tn-ref-across moved)
+          while moved
+          do (sc-case (tn-ref-tn moved)
+               ((descriptor-reg any-reg)
+                (inst sub (tn-ref-tn moved) (tn-ref-tn moved) src))
+               ((control-stack)
+                (load-stack-tn temp (tn-ref-tn moved))
+                (inst sub temp temp src)
+                (store-stack-tn (tn-ref-tn moved) temp))))))
+
 
 ;;; Push some values onto the stack, returning the start and number of values
 ;;; pushed as results.  It is assumed that the Vals are wired to the standard
@@ -28,7 +83,7 @@
   (:temporary (:scs (descriptor-reg)) temp)
   (:generator 20
     (inst mr start csp-tn)
-    (inst addi csp-tn csp-tn (* nvals sb!vm:n-word-bytes))
+    (inst addi csp-tn csp-tn (* nvals n-word-bytes))
     (do ((val vals (tn-ref-across val))
         (i 0 (1+ i)))
        ((null val))
@@ -64,12 +119,12 @@
 
       (emit-label loop)
       (inst cmpw list null-tn)
-      (loadw temp list sb!vm:cons-car-slot sb!vm:list-pointer-lowtag)
+      (loadw temp list cons-car-slot list-pointer-lowtag)
       (inst beq done)
-      (loadw list list sb!vm:cons-cdr-slot sb!vm:list-pointer-lowtag)
-      (inst addi csp-tn csp-tn sb!vm:n-word-bytes)
+      (loadw list list cons-cdr-slot list-pointer-lowtag)
+      (inst addi csp-tn csp-tn n-word-bytes)
       (storew temp csp-tn -1)
-      (test-type list ndescr loop nil sb!vm:list-pointer-lowtag)
+      (test-type list loop nil (list-pointer-lowtag) :temp ndescr)
       (error-call vop bogus-arg-to-values-list-error list)
 
       (emit-label done)