Fix (compile '(setf function)).

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

diff --git a/src/compiler/hppa/nlx.lisp b/src/compiler/hppa/nlx.lisp
index b5dd83a..78884d6 100644 (file)
--- a/src/compiler/hppa/nlx.lisp
+++ b/src/compiler/hppa/nlx.lisp
@@ -1,14 +1,14 @@
 (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))
 
 ;;; 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.
@@ -135,8 +135,8 @@
 
 
 (define-vop (nlx-entry)
-  (:args (sp) ; Note: we can't list an sc-restriction, 'cause any load vops
-              ; would be inserted before the LRA.
+  (:args (sp) ;; Note: we can't list an sc-restriction, 'cause any load vops
+              ;; would be inserted before the LRA.
          (start)
          (count))
   (:results (values :more t))
@@ -179,8 +179,7 @@
                          (move null-tn tn))
                        (control-stack
                          (store-stack-tn tn null-tn)))))
-                 (inst b defaulting-done)
-                 (inst nop)))))) ; FIX remove me or tell why I'm needed
+                 (inst b defaulting-done :nullify t))))))
     (load-stack-tn csp-tn sp)))
 
 
@@ -211,8 +210,7 @@
       (sc-case new-start
         (any-reg (move dst new-start))
         (control-stack (store-stack-tn new-start dst)))
-      (inst comb := num zero-tn done)
-      (inst nop) ; fix-lav remove nop
+      (inst comb := num zero-tn done :nullify t)
       (sc-case new-count
         (any-reg (move num new-count))
         (control-stack (store-stack-tn new-count num)))