X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmips%2Fvalues.lisp;h=cf0e8dd4c75ac63ee4ed62bb43bafb46ff57f7a1;hb=d2561c6826f9e590d9174007f9642237d79a46df;hp=c9427a123866ff81f887ac97d957c892c77498dc;hpb=4ae1b794a5d6a90794468cf8017f5307f2c30dfe;p=sbcl.git

diff --git a/src/compiler/mips/values.lisp b/src/compiler/mips/values.lisp
index c9427a1..cf0e8dd 100644
--- a/src/compiler/mips/values.lisp
+++ b/src/compiler/mips/values.lisp
@@ -1,3 +1,14 @@
+;;;; the MIPS implementation of unknown-values VOPs
+
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
+
 (in-package "SB!VM")
 
 (define-vop (reset-stack-pointer)
@@ -5,6 +16,62 @@
   (: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.")))
+
+(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 move src last-preserved-ptr)
+    (inst move dest last-nipped-ptr)
+    (inst move temp zero-tn)
+    (inst sltu temp src csp-tn)
+    (inst beq temp zero-tn DONE)
+    (inst nop) ; not strictly necessary
+    LOOP
+    (loadw temp src)
+    (inst add dest dest n-word-bytes)
+    (inst add src src n-word-bytes)
+    (storew temp dest -1)
+    (inst sltu temp src csp-tn)
+    (inst bne temp zero-tn LOOP)
+    (inst nop)
+    DONE
+    (inst move 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
@@ -42,10 +109,8 @@
     (move start start-temp)
     (inst li count (fixnumize nvals))))
 
-
 ;;; Push a list of values on the stack, returning Start and Count as used in
 ;;; unknown values continuations.
-;;;
 (define-vop (values-list)
   (:args (arg :scs (descriptor-reg) :target list))
   (:arg-types list)
@@ -76,10 +141,8 @@
     DONE
     (inst subu count csp-tn start)))
 
-
 ;;; Copy the more arg block to the top of the stack so we can use them
 ;;; as function arguments.
-;;;
 (define-vop (%more-arg-values)
   (:args (context :scs (descriptor-reg any-reg) :target src)
 	 (skip :scs (any-reg zero immediate))