X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=091475c953d7aed5894c8ec21f9580612e9f2743;hb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;hp=9dcf76de00e3e5239abeec25878486883795dd7b;hpb=ce02ab2ecd9c6ae2e570abd8c93ebf3be55bbdad;p=sbcl.git

diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp
index 9dcf76d..091475c 100644
--- a/src/compiler/generic/vm-type.lisp
+++ b/src/compiler/generic/vm-type.lisp
@@ -20,7 +20,7 @@
 
 ;;;; FIXME: I'm not sure where to put this. -- WHN 19990817
 
-(deftype sb!vm:word () `(unsigned-byte ,sb!vm:word-bits))
+(deftype sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits))
 
 ;;;; implementation-dependent DEFTYPEs
 
@@ -72,7 +72,7 @@
 ;;; internal time format. (Note: not a FIXNUM, ouch..)
 (sb!xc:deftype internal-time () 'unsigned-byte)
 
-(sb!xc:deftype bignum-element-type () `(unsigned-byte ,sb!vm:word-bits))
+(sb!xc:deftype bignum-element-type () `(unsigned-byte ,sb!vm:n-word-bits))
 (sb!xc:deftype bignum-type () 'bignum)
 (sb!xc:deftype bignum-index () 'index)
 
@@ -133,8 +133,7 @@
 	  (if (eq eltype *wild-type*)
 	      *wild-type*
 	      (dolist (stype-name *specialized-array-element-types*
-				  ;; FIXME: Use *UNIVERSAL-TYPE* here?
-				  (specifier-type 't))
+				  *universal-type*)
 		;; FIXME: Mightn't it be better to have
 		;; *SPECIALIZED-ARRAY-ELEMENT-TYPES* be stored as precalculated
 		;; SPECIFIER-TYPE results, instead of having to calculate
@@ -177,7 +176,7 @@
 	   ((type= type (specifier-type '(unsigned-byte 32)))
 	    'sb!c:check-unsigned-byte-32)
 	   (t nil)))
-    (function-type
+    (fun-type
      'sb!c:check-function)
     (t
      nil)))