X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Falpha%2Fcall.lisp;h=63e2de378b9098e5c296d76f85ae4d2900b380cd;hb=b63c4fb9b98fa8188e17ba926e150ba417a74635;hp=14f17531be19ab99d485d49ecdf7edc408913db3;hpb=581e3d62de8cb37e13ad9db63e5537c0f962be28;p=sbcl.git

diff --git a/src/compiler/alpha/call.lisp b/src/compiler/alpha/call.lisp
index 14f1753..63e2de3 100644
--- a/src/compiler/alpha/call.lisp
+++ b/src/compiler/alpha/call.lisp
@@ -306,7 +306,7 @@ default-value-8
 		    (tn (tn-ref-tn val)))
 		(defaults (cons default-lab tn))
 		
-		(inst blt temp default-lab)
+		(inst ble temp default-lab)
 		(inst ldl move-temp (* i n-word-bytes) ocfp-tn)
 		(inst subq temp (fixnumize 1) temp)
 		(store-stack-tn tn move-temp)))
@@ -322,9 +322,8 @@ default-value-8
 		    ((null remaining))
 		  (let ((def (car remaining)))
 		    (emit-label (car def))
-		    (when (null (cdr remaining))
-		      (inst br zero-tn defaulting-done))
-		    (store-stack-tn (cdr def) null-tn)))))))
+		    (store-stack-tn (cdr def) null-tn)))
+		(inst br zero-tn defaulting-done)))))
 
 	(when lra-label
 	  (inst compute-code-from-lra code-tn code-tn lra-label temp))))
@@ -947,7 +946,12 @@ default-value-8
     ;; restore the frame pointer and clear as much of the control
     ;; stack as possible.
     (move ocfp cfp-tn)
-    (inst addq val-ptr (* nvals n-word-bytes) csp-tn)
+    ;; ADDQ only accepts immediates of type (UNSIGNED-BYTE 8).  Here,
+    ;; instead of adding (* NVALS N-WORD-BYTES), we use NARGS that
+    ;; we've carefully set up, but protect ourselves by averring that
+    ;; FIXNUMIZEation and multiplication by N-WORD-BYTES is the same.
+    (aver (= (* nvals n-word-bytes) (fixnumize nvals)))
+    (inst addq val-ptr nargs csp-tn)
     ;; pre-default any argument register that need it.
     (when (< nvals register-arg-count)
       (dolist (reg (subseq (list a0 a1 a2 a3 a4 a5) nvals))