X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fmeta-vmdef.lisp;h=dc5b37d32ee73cb7e26579427a3d17be0f0aa793;hb=2912f5f6c2acb2da3b9fcc0f5afd1ca89782a9f8;hp=a3fcba105472d7f9b779c9e7110902559e7c960f;hpb=cd1f265dd851941557ed3f764248c339c07493a9;p=sbcl.git

diff --git a/src/compiler/meta-vmdef.lisp b/src/compiler/meta-vmdef.lisp
index a3fcba1..dc5b37d 100644
--- a/src/compiler/meta-vmdef.lisp
+++ b/src/compiler/meta-vmdef.lisp
@@ -679,8 +679,16 @@
 				       nil)
 				   t)))
 			   :key #'car))
-	     (oe-type '(mod #.max-vop-tn-refs)) ; :REF-ORDERING element type
-	     (te-type '(mod #.(* max-vop-tn-refs 2))) ; :TARGETS element type
+	     ;; :REF-ORDERING element type
+	     ;;
+	     ;; KLUDGE: was (MOD #.MAX-VOP-TN-REFS), which is still right
+	     (oe-type '(unsigned-byte 8))
+	     ;; :TARGETS element-type
+	     ;;
+	     ;; KLUDGE: was (MOD #.(* MAX-VOP-TN-REFS 2)), which does
+	     ;; not correspond to the definition in
+	     ;; src/compiler/vop.lisp.
+	     (te-type '(unsigned-byte 16))
 	     (ordering (make-specializable-array
 			(length sorted)
 			:element-type oe-type)))
@@ -746,13 +754,13 @@
 				(rassoc name (funs)))))
 		(unless name
 		  (error "no move function defined to ~:[save~;load~] SC ~S ~
-			  with ~S ~:[to~;from~] from SC ~S"
+			  ~:[to~;from~] from SC ~S"
 			 load-p sc-name load-p (sc-name alt)))
 		
 		(cond (found
 		       (unless (eq (cdr found) name)
 			 (error "can't tell whether to ~:[save~;load~]~@
-				 or ~S when operand is in SC ~S"
+				 with ~S or ~S when operand is in SC ~S"
 				load-p name (cdr found) (sc-name alt)))
 		       (pushnew alt (car found)))
 		      (t
@@ -1257,7 +1265,7 @@
 		       (error "bad thing to be a operand type: ~S" spec)))))))
     (mapcar #'parse-operand-type specs)))
 
-;;; Check the consistency of Op's Sc restrictions with the specified
+;;; Check the consistency of OP's SC restrictions with the specified
 ;;; primitive-type restriction. :CONSTANT operands have already been
 ;;; filtered out, so only :OR and * restrictions are left.
 ;;;