X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fvalues.lisp;h=beb3057e32eeade10f845dda87a6124a39e2bbd6;hb=a4882e3023fdd5e777169a4cbede33605281173c;hp=9e0efc2e09df25e0b38aaa23b2084ed5bee212f4;hpb=4081f91910d6dc5dc79e2c43b8a746acaa78ecd9;p=sbcl.git

diff --git a/src/compiler/ppc/values.lisp b/src/compiler/ppc/values.lisp
index 9e0efc2..beb3057 100644
--- a/src/compiler/ppc/values.lisp
+++ b/src/compiler/ppc/values.lisp
@@ -2,7 +2,7 @@
 ;;; Written by Rob MacLachlan
 ;;;
 ;;; Converted for SPARC by William Lott.
-;;; 
+;;;
 
 (in-package "SB!VM")
 
@@ -11,6 +11,41 @@
   (:generator 1
     (move csp-tn ptr)))
 
+;;; 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
@@ -23,22 +58,22 @@
 (define-vop (push-values)
   (:args (vals :more t))
   (:results (start :scs (any-reg) :from :load)
-	    (count :scs (any-reg)))
+            (count :scs (any-reg)))
   (:info nvals)
   (:temporary (:scs (descriptor-reg)) temp)
   (:generator 20
     (inst mr start csp-tn)
     (inst addi csp-tn csp-tn (* nvals n-word-bytes))
     (do ((val vals (tn-ref-across val))
-	 (i 0 (1+ i)))
-	((null val))
+         (i 0 (1+ i)))
+        ((null val))
       (let ((tn (tn-ref-tn val)))
-	(sc-case tn
-	  (descriptor-reg
-	   (storew tn start i))
-	  (control-stack
-	   (load-stack-tn temp tn)
-	   (storew temp start i)))))
+        (sc-case tn
+          (descriptor-reg
+           (storew tn start i))
+          (control-stack
+           (load-stack-tn temp tn)
+           (storew temp start i)))))
     (inst lr count (fixnumize nvals))))
 
 ;;; Push a list of values on the stack, returning Start and Count as used in
@@ -49,7 +84,7 @@
   (:arg-types list)
   (:policy :fast-safe)
   (:results (start :scs (any-reg))
-	    (count :scs (any-reg)))
+            (count :scs (any-reg)))
   (:temporary (:scs (descriptor-reg) :type list :from (:argument 0)) list)
   (:temporary (:scs (descriptor-reg)) temp)
   (:temporary (:scs (non-descriptor-reg)) ndescr)
@@ -57,7 +92,7 @@
   (:save-p :compute-only)
   (:generator 0
     (let ((loop (gen-label))
-	  (done (gen-label)))
+          (done (gen-label)))
 
       (move list arg)
       (move start csp-tn)
@@ -81,15 +116,15 @@
 ;;;
 (define-vop (%more-arg-values)
   (:args (context :scs (descriptor-reg any-reg) :target src)
-	 (skip :scs (any-reg zero immediate))
-	 (num :scs (any-reg) :target count))
+         (skip :scs (any-reg zero immediate))
+         (num :scs (any-reg) :target count))
   (:arg-types * positive-fixnum positive-fixnum)
   (:temporary (:sc any-reg :from (:argument 0)) src)
   (:temporary (:sc any-reg :from (:argument 2)) dst)
   (:temporary (:sc descriptor-reg :from (:argument 1)) temp)
   (:temporary (:sc any-reg) i)
   (:results (start :scs (any-reg))
-	    (count :scs (any-reg)))
+            (count :scs (any-reg)))
   (:generator 20
     (sc-case skip
       (zero