X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fvalues.lisp;h=ddead7c356fe09189037266c447a081f9bca6df9;hb=9304704f68a18894fa8eb985b387465e5d25e1d5;hp=36cbd5baa77fd81cced9425cd1812073c9be6fbd;hpb=8345d5a06a5fc3c83d394d9ee81a7065d69fa205;p=sbcl.git

diff --git a/src/compiler/ppc/values.lisp b/src/compiler/ppc/values.lisp
index 36cbd5b..ddead7c 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,26 +11,6 @@
   (: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)
@@ -78,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
@@ -104,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)
@@ -112,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)
@@ -125,7 +105,7 @@
       (inst addi csp-tn csp-tn n-word-bytes)
       (storew temp csp-tn -1)
       (test-type list loop nil (list-pointer-lowtag) :temp ndescr)
-      (error-call vop bogus-arg-to-values-list-error list)
+      (error-call vop 'bogus-arg-to-values-list-error list)
 
       (emit-label done)
       (inst sub count csp-tn start))))
@@ -136,23 +116,16 @@
 ;;;
 (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))
-  (:arg-types * positive-fixnum positive-fixnum)
+         (num :scs (any-reg) :target count))
+  (:arg-types * 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
-       (inst mr src context))
-      (immediate
-       (inst addi src context (* (tn-value skip) n-word-bytes)))
-      (any-reg
-       (inst add src context skip)))
+    (inst mr src context)
     (inst mr. count num)
     (inst mr start csp-tn)
     (inst beq done)