0.6.12.3:

[sbcl.git] / src / compiler / x86 / static-fn.lisp

diff --git a/src/compiler/x86/static-fn.lisp b/src/compiler/x86/static-fn.lisp
index 5874224..111701b 100644 (file)
--- a/src/compiler/x86/static-fn.lisp
+++ b/src/compiler/x86/static-fn.lisp
@@ -11,9 +11,6 @@
 
 (in-package "SB!VM")
 
-(file-comment
- "$Header$")
-
 (define-vop (static-function-template)
   (:save-p t)
   (:policy :safe)
@@ -40,11 +37,10 @@
     (moves)))
 
 (defun static-function-template-vop (num-args num-results)
-  (assert (and (<= num-args register-arg-count)
+  (unless (and (<= num-args register-arg-count)
               (<= num-results register-arg-count))
-         (num-args num-results)
-         "Either too many args (~D) or too many results (~D). Max = ~D"
-         num-args num-results register-arg-count)
+    (error "either too many args (~D) or too many results (~D); max = ~D"
+          num-args num-results register-arg-count))
   (let ((num-temps (max num-args num-results)))
     (collect ((temp-names) (temps) (arg-names) (args) (result-names) (results))
       (dotimes (i num-results)
@@ -55,7 +51,7 @@
        (let ((temp-name (intern (format nil "TEMP-~D" i))))
          (temp-names temp-name)
          (temps `(:temporary (:sc descriptor-reg
-                              :offset ,(nth i register-arg-offsets)
+                              :offset ,(nth i *register-arg-offsets*)
                               :from ,(if (< i num-args)
                                          `(:argument ,i)
                                          '(:eval 1))