Get rid of vm-support-routines indirection.

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

diff --git a/src/compiler/mips/nlx.lisp b/src/compiler/mips/nlx.lisp
index ed25b12..18d6552 100644 (file)
--- a/src/compiler/mips/nlx.lisp
+++ b/src/compiler/mips/nlx.lisp
@@ -1,7 +1,7 @@
 (in-package "SB!VM")
 
 ;;; Make an environment-live stack TN for saving the SP for NLX entry.
-(!def-vm-support-routine make-nlx-sp-tn (env)
+(defun make-nlx-sp-tn (env)
   (physenv-live-tn
    (make-representation-tn *fixnum-primitive-type* immediate-arg-scn)
    env))
@@ -9,7 +9,7 @@
 ;;; Make a TN for the argument count passing location for a
 ;;; non-local entry.
 ;;;
-(!def-vm-support-routine make-nlx-entry-arg-start-location ()
+(defun make-nlx-entry-arg-start-location ()
   (make-wired-tn *fixnum-primitive-type* immediate-arg-scn ocfp-offset))
 \f
 ;;; Save and restore dynamic environment.
@@ -155,7 +155,7 @@
     (cond ((zerop nvals))
           ((= nvals 1)
            (let ((no-values (gen-label)))
-             (inst beq count zero-tn no-values)
+             (inst beq count no-values)
              (move (tn-ref-tn values) null-tn t)
              (loadw (tn-ref-tn values) start)
              (emit-label no-values)))
@@ -168,7 +168,7 @@
                      (tn (tn-ref-tn tn-ref)))
                  (defaults (cons default-lab tn))
 
-                 (inst beq count zero-tn default-lab)
+                 (inst beq count default-lab)
                  (inst addu count count (fixnumize -1))
                  (sc-case tn
                           ((descriptor-reg any-reg)
@@ -222,7 +222,7 @@
       (sc-case new-start
         (any-reg (move new-start dst))
         (control-stack (store-stack-tn new-start dst)))
-      (inst beq num zero-tn done)
+      (inst beq num done)
       (inst nop)
       (sc-case new-count
         (any-reg (move new-count num))
@@ -234,7 +234,7 @@
       (inst addu src src n-word-bytes)
       (inst addu num num (fixnumize -1))
       (storew temp dst)
-      (inst bne num zero-tn loop)
+      (inst bne num loop)
       (inst addu dst dst n-word-bytes)
 
       (emit-label done)