0.pre8.7

[sbcl.git] / src / compiler / alpha / nlx.lisp

diff --git a/src/compiler/alpha/nlx.lisp b/src/compiler/alpha/nlx.lisp
index 654d39d..2e414f2 100644 (file)
--- a/src/compiler/alpha/nlx.lisp
+++ b/src/compiler/alpha/nlx.lisp
@@ -22,7 +22,6 @@
 ;;; non-local entry.
 (!def-vm-support-routine make-nlx-entry-arg-start-location ()
   (make-wired-tn *fixnum-primitive-type* immediate-arg-scn ocfp-offset))
-
 \f
 ;;;; save and restoring the dynamic environment
 ;;;;
@@ -35,19 +34,10 @@
 ;;;; 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- 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*)
-       (make-normal-tn *backend-t-primitive-type*)
-       (make-normal-tn *backend-t-primitive-type*)))
-
 (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*)
@@ -59,8 +49,7 @@
 (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
@@ -105,7 +94,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)