X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fnlx.lisp;h=6f333025b4eac37ba1d4de5c5dd3cc7c0b09f3cd;hb=c81c32ef8a737b0cc61d3c0c6a137cab39baac73;hp=0578a947d620ccd6be4ba54257d628bd50221126;hpb=aa61c7571b33b86981301f34d3acdb66666f53a3;p=sbcl.git

diff --git a/src/compiler/alpha/nlx.lisp b/src/compiler/alpha/nlx.lisp
index 0578a94..6f33302 100644
--- a/src/compiler/alpha/nlx.lisp
+++ b/src/compiler/alpha/nlx.lisp
@@ -20,7 +20,7 @@
 
 ;;; Make a TN for the argument count passing location for a
 ;;; non-local entry.
-(!def-vm-support-routine make-nlx-entry-argument-start-location ()
+(!def-vm-support-routine make-nlx-entry-arg-start-location ()
   (make-wired-tn *fixnum-primitive-type* immediate-arg-scn ocfp-offset))
 
 
@@ -28,15 +28,15 @@
 ;;;;
 ;;;; These VOPs are used in the reentered function to restore the
 ;;;; appropriate dynamic environment. Currently we only save the
-;;;; Current-Catch and binding stack pointer. We don't need to
-;;;; save/restore the current unwind-protect, since unwind-protects
+;;;; CURRENT-CATCH and binding stack pointer. We don't need to
+;;;; save/restore the current UNWIND-PROTECT, since UNWIND-PROTECTS
 ;;;; are implicitly processed during unwinding. If there were any
-;;;; additional stacks, then this would be the place to restore the
+;;;; additional stacks (as e.g. there was an interpreter "eval stack"
+;;;; before sbcl-0.7.0), then this would be the place to restore the
 ;;;; top pointers.
 
-
-;;; Return a list of TNs that can be used to snapshot the dynamic state for
-;;; use with the Save/Restore-Dynamic-Environment VOPs.
+;;; Return a list of TNs that can be used to snapshot the dynamic
+;;; state for use with the SAVE- and RESTORE-DYNAMIC-ENVIRONMENT VOPs.
 (!def-vm-support-routine make-dynamic-state-tns ()
   (list (make-normal-tn *backend-t-primitive-type*)
 	(make-normal-tn *backend-t-primitive-type*)
@@ -46,27 +46,23 @@
 (define-vop (save-dynamic-state)
   (:results (catch :scs (descriptor-reg))
 	    (nfp :scs (descriptor-reg))
-	    (nsp :scs (descriptor-reg))
-	    (eval :scs (descriptor-reg)))
+	    (nsp :scs (descriptor-reg)))
   (:vop-var vop)
   (:generator 13
     (load-symbol-value catch *current-catch-block*)
     (let ((cur-nfp (current-nfp-tn vop)))
       (when cur-nfp
 	(inst mskll cur-nfp 4 nfp)))
-    (inst mskll nsp-tn 4 nsp)
-    (load-symbol-value eval *eval-stack-top*)))
+    (inst mskll nsp-tn 4 nsp)))
 
 (define-vop (restore-dynamic-state)
   (:args (catch :scs (descriptor-reg))
 	 (nfp :scs (descriptor-reg))
-	 (nsp :scs (descriptor-reg))
-	 (eval :scs (descriptor-reg)))
+	 (nsp :scs (descriptor-reg)))
   (:vop-var vop)
   (:temporary (:sc any-reg) temp)
   (:generator 10
     (store-symbol-value catch *current-catch-block*)
-    (store-symbol-value eval *eval-stack-top*)
     (inst mskll nsp-tn 0 temp)
     (let ((cur-nfp (current-nfp-tn vop)))
       (when cur-nfp
@@ -107,7 +103,7 @@
 ;;; specified tag, and link the block into the Current-Catch list.
 (define-vop (make-catch-block)
   (:args (tn)
-	 (tag :scs (descriptor-reg)))
+	 (tag :scs (any-reg descriptor-reg)))
   (:info entry-label)
   (:results (block :scs (any-reg)))
   (:temporary (:scs (descriptor-reg)) temp)