X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fvmdef.lisp;h=3b6fb422cca94c841da9b95452c316493d102f6d;hb=8f4ef01b8c9930d7dd0a56a96845a6d84ca5774d;hp=5af6cd488683e1175b8b09f05c30db4557d08e93;hpb=34dd23563d2f5cf05c72b971da0d0b065a09bf2a;p=sbcl.git

diff --git a/src/compiler/vmdef.lisp b/src/compiler/vmdef.lisp
index 5af6cd4..3b6fb42 100644
--- a/src/compiler/vmdef.lisp
+++ b/src/compiler/vmdef.lisp
@@ -47,7 +47,7 @@
 
 ;;;; side effect classes
 
-(def-boolean-attribute vop
+(!def-boolean-attribute vop
   any)
 
 ;;;; move/coerce definition
@@ -102,7 +102,7 @@
   ;; -- AL 20010218
   ;;
   ;; See also the description of VOP-INFO-TARGETS. -- APD, 2002-01-30
-  (defconstant max-vop-tn-refs 256))
+  (def!constant max-vop-tn-refs 256))
 
 (defvar *vop-tn-refs* (make-array max-vop-tn-refs :initial-element nil))
 (defvar *using-vop-tn-refs* nil)
@@ -113,7 +113,7 @@
 
 (pushnew 'flush-vop-tn-refs *before-gc-hooks*)
 
-(defconstant sc-bits (integer-length (1- sc-number-limit)))
+(def!constant sc-bits (integer-length (1- sc-number-limit)))
 
 (defun emit-generic-vop (node block template args results &optional info)
   (%emit-generic-vop node block template args results info))
@@ -199,7 +199,7 @@
 	#'<=
 	:key #'template-cost))
 
-;;; Return a function type specifier describing Template's type computed
+;;; Return a function type specifier describing TEMPLATE's type computed
 ;;; from the operand type restrictions.
 (defun template-type-specifier (template)
   (declare (type template template))
@@ -208,10 +208,7 @@
 		    (if (eq x '*)
 			t
 			(ecase (first x)
-			  (:or `(or ,@(mapcar (lambda (type)
-						(type-specifier
-						 (primitive-type-type
-						  type)))
+			  (:or `(or ,@(mapcar #'primitive-type-specifier
 					      (rest x))))
 			  (:constant `(constant-arg ,(third x)))))))
 	     `(,@(mapcar #'frob types)