X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fx86%2Fnlx.lisp;h=c15ba615cae40eae56e4f9734557ea53b9be06c6;hb=68c539ab90bb39f342229e68bf9286f63824597a;hp=f354b9227bc58fa07a134c8a1ddd244654ca71c4;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/compiler/x86/nlx.lisp b/src/compiler/x86/nlx.lisp
index f354b92..c15ba61 100644
--- a/src/compiler/x86/nlx.lisp
+++ b/src/compiler/x86/nlx.lisp
@@ -11,17 +11,14 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
 ;;; Make an environment-live stack TN for saving the SP for NLX entry.
-(def-vm-support-routine make-nlx-sp-tn (env)
+(!def-vm-support-routine make-nlx-sp-tn (env)
   (environment-live-tn
    (make-representation-tn *fixnum-primitive-type* any-reg-sc-number)
    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-argument-start-location ()
   (make-wired-tn *fixnum-primitive-type* any-reg-sc-number ebx-offset))
 
 (defun catch-block-ea (tn)
@@ -44,7 +41,7 @@
 
 ;;; 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 ()
+(!def-vm-support-routine make-dynamic-state-tns ()
   (make-n-tns 3 *backend-t-primitive-type*))
 
 (define-vop (save-dynamic-state)
@@ -157,7 +154,7 @@
     (cond ((zerop nvals))
 	  ((= nvals 1)
 	   (let ((no-values (gen-label)))
-	     (inst mov (tn-ref-tn values) *nil-value*)
+	     (inst mov (tn-ref-tn values) nil-value)
 	     (inst jecxz no-values)
 	     (loadw (tn-ref-tn values) start -1)
 	     (emit-label no-values)))
@@ -183,7 +180,7 @@
 	       (assemble (*elsewhere*)
 		 (dolist (def (defaults))
 		   (emit-label (car def))
-		   (inst mov (cdr def) *nil-value*))
+		   (inst mov (cdr def) nil-value))
 		 (inst jmp defaulting-done))))))
     (inst mov esp-tn sp)))