X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fnlx.lisp;h=d8444633e3e33810c5f7b58ef570e5e9d4f899d7;hb=104ee7ee303efa16e415f5e75df635ac54dba733;hp=bb061541158f66bf4de778797a02cfd2ac8b1208;hpb=63fcb94b875a97e468d9add229e220ecceec2352;p=sbcl.git

diff --git a/src/compiler/alpha/nlx.lisp b/src/compiler/alpha/nlx.lisp
index bb06154..d844463 100644
--- a/src/compiler/alpha/nlx.lisp
+++ b/src/compiler/alpha/nlx.lisp
@@ -1,4 +1,4 @@
-;;;; the definitions of VOPs used for non-local exit (throw, lexical
+;;;; the definitions of VOPs used for non-local exit (THROW, lexical
 ;;;; exit, etc.)
 
 ;;;; This software is part of the SBCL system. See the README file for
@@ -14,13 +14,13 @@
 
 ;;; Make an environment-live stack TN for saving the SP for NLX entry.
 (!def-vm-support-routine make-nlx-sp-tn (env)
-  (environment-live-tn
+  (physenv-live-tn
    (make-representation-tn *fixnum-primitive-type* immediate-arg-scn)
    env))
 
 ;;; 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))
 
 
@@ -50,12 +50,12 @@
 	    (eval :scs (descriptor-reg)))
   (:vop-var vop)
   (:generator 13
-    (load-symbol-value catch sb!impl::*current-catch-block*)
+    (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 sb!impl::*eval-stack-top*)))
+    (load-symbol-value eval *eval-stack-top*)))
 
 (define-vop (restore-dynamic-state)
   (:args (catch :scs (descriptor-reg))
@@ -65,8 +65,8 @@
   (:vop-var vop)
   (:temporary (:sc any-reg) temp)
   (:generator 10
-    (store-symbol-value catch sb!impl::*current-catch-block*)
-    (store-symbol-value eval sb!impl::*eval-stack-top*)
+    (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
@@ -94,8 +94,8 @@
   (:temporary (:scs (descriptor-reg)) temp)
   (:temporary (:scs (non-descriptor-reg)) ndescr)
   (:generator 22
-    (inst lda block (* (tn-offset tn) sb!vm:word-bytes) cfp-tn)
-    (load-symbol-value temp sb!impl::*current-unwind-protect-block*)
+    (inst lda block (* (tn-offset tn) sb!vm:n-word-bytes) cfp-tn)
+    (load-symbol-value temp *current-unwind-protect-block*)
     (storew temp block sb!vm:unwind-block-current-uwp-slot)
     (storew cfp-tn block sb!vm:unwind-block-current-cont-slot)
     (storew code-tn block sb!vm:unwind-block-current-code-slot)
@@ -114,8 +114,8 @@
   (:temporary (:scs (descriptor-reg) :target block :to (:result 0)) result)
   (:temporary (:scs (non-descriptor-reg)) ndescr)
   (:generator 44
-    (inst lda result (* (tn-offset tn) sb!vm:word-bytes) cfp-tn)
-    (load-symbol-value temp sb!impl::*current-unwind-protect-block*)
+    (inst lda result (* (tn-offset tn) sb!vm:n-word-bytes) cfp-tn)
+    (load-symbol-value temp *current-unwind-protect-block*)
     (storew temp result sb!vm:catch-block-current-uwp-slot)
     (storew cfp-tn result sb!vm:catch-block-current-cont-slot)
     (storew code-tn result sb!vm:catch-block-current-code-slot)
@@ -123,9 +123,9 @@
     (storew temp result sb!vm:catch-block-entry-pc-slot)
 
     (storew tag result sb!vm:catch-block-tag-slot)
-    (load-symbol-value temp sb!impl::*current-catch-block*)
+    (load-symbol-value temp *current-catch-block*)
     (storew temp result sb!vm:catch-block-previous-catch-slot)
-    (store-symbol-value result sb!impl::*current-catch-block*)
+    (store-symbol-value result *current-catch-block*)
 
     (move result block)))
 
@@ -135,27 +135,26 @@
   (:args (tn))
   (:temporary (:scs (descriptor-reg)) new-uwp)
   (:generator 7
-    (inst lda new-uwp (* (tn-offset tn) sb!vm:word-bytes) cfp-tn)
-    (store-symbol-value new-uwp sb!impl::*current-unwind-protect-block*)))
-
+    (inst lda new-uwp (* (tn-offset tn) sb!vm:n-word-bytes) cfp-tn)
+    (store-symbol-value new-uwp *current-unwind-protect-block*)))
 
 (define-vop (unlink-catch-block)
   (:temporary (:scs (any-reg)) block)
   (:policy :fast-safe)
   (:translate %catch-breakup)
   (:generator 17
-    (load-symbol-value block sb!impl::*current-catch-block*)
+    (load-symbol-value block *current-catch-block*)
     (loadw block block sb!vm:catch-block-previous-catch-slot)
-    (store-symbol-value block sb!impl::*current-catch-block*)))
+    (store-symbol-value block *current-catch-block*)))
 
 (define-vop (unlink-unwind-protect)
   (:temporary (:scs (any-reg)) block)
   (:policy :fast-safe)
   (:translate %unwind-protect-breakup)
   (:generator 17
-    (load-symbol-value block sb!impl::*current-unwind-protect-block*)
+    (load-symbol-value block *current-unwind-protect-block*)
     (loadw block block sb!vm:unwind-block-current-uwp-slot)
-    (store-symbol-value block sb!impl::*current-unwind-protect-block*)))
+    (store-symbol-value block *current-unwind-protect-block*)))
 
 ;;;; NLX entry VOPs
 
@@ -250,10 +249,10 @@
       ;; Copy stuff on stack.
       (emit-label loop)
       (loadw temp src)
-      (inst lda src sb!vm:word-bytes src)
+      (inst lda src sb!vm:n-word-bytes src)
       (storew temp dst)
       (inst lda num (fixnumize -1) num)
-      (inst lda dst sb!vm:word-bytes dst)
+      (inst lda dst sb!vm:n-word-bytes dst)
       (inst bne num loop)
 
       (emit-label done)