X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fvalues.lisp;h=6b385a4cda16d25894f47e5cb0ac58b4fb73e411;hb=7c7e6276719b8d40fddec2070cad81064a25c8ed;hp=e03476a62c07fd0c427511ca2a29a7eca8bee194;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git

diff --git a/src/compiler/alpha/values.lisp b/src/compiler/alpha/values.lisp
index e03476a..6b385a4 100644
--- a/src/compiler/alpha/values.lisp
+++ b/src/compiler/alpha/values.lisp
@@ -1,37 +1,64 @@
-;;; -*- Package: ALPHA -*-
-;;;
-;;; **********************************************************************
-;;; This code was written as part of the CMU Common Lisp project at
-;;; Carnegie Mellon University, and has been placed in the public domain.
-;;;
+;;;; the Alpha implementation of unknown-values VOPs
 
-;;;
-;;; **********************************************************************
-;;;
-;;;    This file contains the implementation of unknown-values VOPs.
-;;;
-;;; Written by Rob MacLachlan
-;;;
-;;; Converted to the Alpha by Sean Hallgren.
-;;; 
+;;;; 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)
   (:args (ptr :scs (any-reg)))
   (:generator 1
     (move ptr csp-tn)))
 
+(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
+    (move last-nipped-ptr dest)
+    (move last-preserved-ptr src)
+    (inst cmple csp-tn src temp)
+    (inst bne temp DONE)
+    LOOP
+    (loadw temp src)
+    (inst addq dest n-word-bytes dest)
+    (inst addq src n-word-bytes src)
+    (storew temp dest -1)
+    (inst cmple csp-tn src temp)
+    (inst beq temp LOOP)
+    DONE
+    (inst lda csp-tn 0 dest)
+    (inst subq src dest src)
+    (loop for moved = moved-ptrs then (tn-ref-across moved)
+	  while moved
+	  do (sc-case (tn-ref-tn moved)
+               ((descriptor-reg any-reg)
+		(inst subq (tn-ref-tn moved) src (tn-ref-tn moved)))
+	       ((control-stack)
+		(load-stack-tn temp (tn-ref-tn moved))
+		(inst subq temp src temp)
+		(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
-;;; argument locations.  Nvals is the number of values to push.
-;;;
-;;; The generator cost is pseudo-random.  We could get it right by defining a
-;;; bogus SC that reflects the costs of the memory-to-memory moves for each
-;;; operand, but this seems unworthwhile.
+;;; 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 argument locations. Nvals is the number of values to
+;;; push.
 ;;;
+;;; The generator cost is pseudo-random. We could get it right by
+;;; defining a bogus SC that reflects the costs of the
+;;; memory-to-memory moves for each operand, but this seems
+;;; unworthwhile.
 (define-vop (push-values)
   (:args
    (vals :more t))
@@ -46,7 +73,7 @@
 	      start-temp)
   (:generator 20
     (move csp-tn start-temp)
-    (inst lda csp-tn (* nvals word-bytes) csp-tn)
+    (inst lda csp-tn (* nvals n-word-bytes) csp-tn)
     (do ((val vals (tn-ref-across val))
 	 (i 0 (1+ i)))
 	((null val))
@@ -60,10 +87,8 @@
     (move start-temp start)
     (inst li (fixnumize nvals) count)))
 
-
-;;; Push a list of values on the stack, returning Start and Count as used in
-;;; unknown values continuations.
-;;;
+;;; 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)
@@ -82,21 +107,20 @@
     LOOP
     (inst cmpeq list null-tn temp)
     (inst bne temp done)
-    (loadw temp list cons-car-slot list-pointer-type)
-    (loadw list list cons-cdr-slot list-pointer-type)
-    (inst lda csp-tn word-bytes csp-tn)
+    (loadw temp list cons-car-slot list-pointer-lowtag)
+    (loadw list list cons-cdr-slot list-pointer-lowtag)
+    (inst lda csp-tn n-word-bytes csp-tn)
     (storew temp csp-tn -1)
     (inst and list lowtag-mask ndescr)
-    (inst xor ndescr list-pointer-type ndescr)
+    (inst xor ndescr list-pointer-lowtag ndescr)
     (inst beq ndescr loop)
-    (error-call vop bogus-argument-to-values-list-error list)
+    (error-call vop bogus-arg-to-values-list-error list)
     
     DONE
     (inst subq csp-tn start count)))
 
-;;; Copy the more arg block to the top of the stack so we can use them
-;;; as function arguments.
-;;;
+;;; 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))
@@ -113,7 +137,7 @@
       (zero
        (move context src))
       (immediate
-       (inst lda src (* (tn-value skip) word-bytes) context))
+       (inst lda src (* (tn-value skip) n-word-bytes) context))
       (any-reg
        (inst addq context skip src)))
     (move num count)