0.6.12.23:

[sbcl.git] / src / compiler / x86 / call.lisp

diff --git a/src/compiler/x86/call.lisp b/src/compiler/x86/call.lisp
index 56442c3..67f5215 100644 (file)
--- a/src/compiler/x86/call.lisp
+++ b/src/compiler/x86/call.lisp
@@ -33,7 +33,7 @@
   (declare (ignore standard))
   (make-wired-tn (primitive-type-or-lose 'system-area-pointer)
                 sap-stack-sc-number return-pc-save-offset))
-;;; If standard is true, then use the standard (full call) location,
+;;; If STANDARD is true, then use the standard (full call) location,
 ;;; otherwise use any legal location.
 ;;;
 ;;; No problems.
@@ -254,7 +254,7 @@
            for tn-ref = (tn-ref-across 2nd-tn-ref)
            then (tn-ref-across tn-ref)
            for count from 2 below register-arg-count
-           do count (inst mov (tn-ref-tn tn-ref) 2nd-tn))))
+           do (inst mov (tn-ref-tn tn-ref) 2nd-tn))))
       (inst mov ebx-tn esp-tn)
       (emit-label regs-defaulted)
       (inst mov esp-tn ebx-tn)))
@@ -748,7 +748,7 @@
 ;;; more arg, but there is no new-FP, since the arguments have been set up in
 ;;; the current frame.
 (macrolet ((define-full-call (name named return variable)
-           (assert (not (and variable (eq return :tail))))
+           (aver (not (and variable (eq return :tail))))
            `(define-vop (,name
                          ,@(when (eq return :unknown)
                              '(unknown-values-receiver)))
@@ -1395,8 +1395,8 @@
     object type)
   (frob layout-invalid-error layout-invalid-error sb!c::%layout-invalid-error
     object layout)
-  (frob odd-keyword-arguments-error odd-keyword-arguments-error
-    sb!c::%odd-keyword-arguments-error)
-  (frob unknown-keyword-argument-error unknown-keyword-argument-error
-    sb!c::%unknown-keyword-argument-error key)
+  (frob odd-key-arguments-error odd-key-arguments-error
+    sb!c::%odd-key-arguments-error)
+  (frob unknown-key-argument-error unknown-key-argument-error
+    sb!c::%unknown-key-argument-error key)
   (frob nil-function-returned-error nil-function-returned-error nil fun))