X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fppc%2Fnlx.lisp;h=b1815a602c2a4b0e97ea95a4fc75da0f5373a4ab;hb=22c1de0a40df83bb5628974010a879cb2c17ff53;hp=93c32316317888fbab7519506889f9e35f37e3ce;hpb=cab2c71bb1bb8a575d9eebdae335e731daa64183;p=sbcl.git

diff --git a/src/compiler/ppc/nlx.lisp b/src/compiler/ppc/nlx.lisp
index 93c3231..b1815a6 100644
--- a/src/compiler/ppc/nlx.lisp
+++ b/src/compiler/ppc/nlx.lisp
@@ -2,65 +2,45 @@
 ;;;
 (in-package "SB!VM")
 
-;;; MAKE-NLX-SP-TN  --  Interface
-;;;
-;;;    Make an environment-live stack TN for saving the SP for NLX entry.
-;;;
+;;; Make an environment-live stack TN for saving the SP for NLX entry.
 (!def-vm-support-routine make-nlx-sp-tn (env)
   (physenv-live-tn
    (make-representation-tn *fixnum-primitive-type* immediate-arg-scn)
    env))
 
-;;; Make-NLX-Entry-Arg-Start-Location  --  Interface
-;;;
-;;;    Make a TN for the argument count passing location for a
+;;; Make a TN for the argument count passing location for a
 ;;; non-local entry.
-;;;
 (!def-vm-support-routine make-nlx-entry-arg-start-location ()
   (make-wired-tn *fixnum-primitive-type* immediate-arg-scn ocfp-offset))
 
 
-;;; Save and restore dynamic environment.
-;;;
-;;;    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 are implicitly processed during unwinding.  If there
-;;; were any additional stacks, then this would be the place to restore the top
+;;; 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 are
+;;; implicitly processed during unwinding. If there were any
+;;; additional stacks, then this would be the place to restore the top
 ;;; pointers.
 
-
-;;; Make-Dynamic-State-TNs  --  Interface
-;;;
-;;;    Return a list of TNs that can be used to snapshot the dynamic state for
-;;; use with the Save/Restore-Dynamic-Environment VOPs.
-;;;
-(!def-vm-support-routine make-dynamic-state-tns ()
-  (make-n-tns 4 *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*)
     (let ((cur-nfp (current-nfp-tn vop)))
       (when cur-nfp
 	(move nfp cur-nfp)))
-    (move nsp nsp-tn)
-    (load-symbol-value eval *eval-stack-top*)))
+    (move nsp nsp-tn)))
 
 (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)
   (:generator 10
     (store-symbol-value catch *current-catch-block*)
-    (store-symbol-value eval *eval-stack-top*)
     (let ((cur-nfp (current-nfp-tn vop)))
       (when cur-nfp
 	(move cur-nfp nfp)))