X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-type.lisp;h=d5750cdf3a0168fea32aa802afa2f53e0bcce3f3;hb=19319c931fc1636835dbef71808cc10e252bcf45;hp=4b4700958f3819020823177bb7f009ed77cb7b9e;hpb=4bc9a2b01540f3a7cbf4499b4689b292fe406139;p=sbcl.git diff --git a/src/compiler/generic/vm-type.lisp b/src/compiler/generic/vm-type.lisp index 4b47009..d5750cd 100644 --- a/src/compiler/generic/vm-type.lisp +++ b/src/compiler/generic/vm-type.lisp @@ -14,13 +14,11 @@ (in-package "SB!KERNEL") -(/show0 "vm-type.lisp 17") - -(!begin-collecting-cold-init-forms) - ;;;; FIXME: I'm not sure where to put this. -- WHN 19990817 -(deftype sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits)) +(def!type sb!vm:word () `(unsigned-byte ,sb!vm:n-word-bits)) +(def!type sb!vm:signed-word () `(signed-byte ,sb!vm:n-word-bits)) + ;;;; implementation-dependent DEFTYPEs @@ -37,7 +35,7 @@ `(single-float ,low ,high)) ;;; an index into an integer -(sb!xc:deftype bit-index () `(integer 0 ,most-positive-fixnum)) +(sb!xc:deftype bit-index () `(integer 0 ,sb!xc:most-positive-fixnum)) ;;; worst-case values for float attributes (sb!xc:deftype float-exponent () @@ -47,6 +45,9 @@ #!-long-float `(integer 0 ,sb!vm:double-float-digits) #!+long-float `(integer 0 ,sb!vm:long-float-digits)) (sb!xc:deftype float-radix () '(integer 2 2)) +(sb!xc:deftype float-int-exponent () + #!-long-float 'double-float-int-exponent + #!+long-float 'long-float-int-exponent) ;;; a code for BOOLE (sb!xc:deftype boole-code () '(unsigned-byte 4)) @@ -60,7 +61,7 @@ ;;; PATHNAME pieces, as returned by the PATHNAME-xxx functions (sb!xc:deftype pathname-host () '(or sb!impl::host null)) (sb!xc:deftype pathname-device () - '(or simple-string (member nil :unspecific))) + '(or simple-string (member nil :unspecific :unc))) (sb!xc:deftype pathname-directory () 'list) (sb!xc:deftype pathname-name () '(or simple-string sb!impl::pattern (member nil :unspecific :wild))) @@ -74,47 +75,30 @@ (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) +;;; FIXME: see also DEFCONSTANT MAXIMUM-BIGNUM-LENGTH in +;;; src/code/bignum.lisp. -- CSR, 2004-07-19 +(sb!xc:deftype bignum-index () + '(integer 0 #.(1- (ash 1 (- sb!vm:n-word-bits sb!vm:n-widetag-bits))))) ;;;; hooks into the type system -;;; the kinds of specialized array that actually exist in this implementation -(defvar *specialized-array-element-types*) -(!cold-init-forms - (setf *specialized-array-element-types* - '(nil - bit - (unsigned-byte 2) - (unsigned-byte 4) - (unsigned-byte 8) - (unsigned-byte 16) - (unsigned-byte 32) - (signed-byte 8) - (signed-byte 16) - (signed-byte 30) - (signed-byte 32) - (complex single-float) - (complex double-float) - #!+long-float (complex long-float) - base-char - single-float - double-float - #!+long-float long-float))) - (sb!xc:deftype unboxed-array (&optional dims) (collect ((types (list 'or))) (dolist (type *specialized-array-element-types*) (when (subtypep type '(or integer character float (complex float))) - (types `(array ,type ,dims)))) + (types `(array ,type ,dims)))) (types))) (sb!xc:deftype simple-unboxed-array (&optional dims) (collect ((types (list 'or))) (dolist (type *specialized-array-element-types*) (when (subtypep type '(or integer character float (complex float))) - (types `(simple-array ,type ,dims)))) + (types `(simple-array ,type ,dims)))) (types))) +(sb!xc:deftype complex-vector (&optional element-type length) + `(and (vector ,element-type ,length) (not simple-array))) + ;;; Return the symbol that describes the format of FLOAT. (declaim (ftype (function (float) symbol) float-format-name)) (defun float-format-name (x) @@ -131,23 +115,24 @@ (defun specialize-array-type (type) (let ((eltype (array-type-element-type type))) (setf (array-type-specialized-element-type type) - (if (or (eq eltype *wild-type*) - ;; This is slightly dubious, but not as dubious as - ;; assuming that the upgraded-element-type should be - ;; equal to T, given the way that the AREF - ;; DERIVE-TYPE optimizer works. -- CSR, 2002-08-19 - (unknown-type-p eltype)) - *wild-type* - (dolist (stype-name *specialized-array-element-types* - *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 - ;; them on the fly this way? (Call the new array - ;; *SPECIALIZED-ARRAY-ELEMENT-SPECIFIER-TYPES* or something..) - (let ((stype (specifier-type stype-name))) - (when (csubtypep eltype stype) - (return stype)))))) + (if (or (eq eltype *wild-type*) + ;; This is slightly dubious, but not as dubious as + ;; assuming that the upgraded-element-type should be + ;; equal to T, given the way that the AREF + ;; DERIVE-TYPE optimizer works. -- CSR, 2002-08-19 + (unknown-type-p eltype)) + *wild-type* + (dolist (stype-name *specialized-array-element-types* + *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 + ;; them on the fly this way? (Call the new array + ;; *SPECIALIZED-ARRAY-ELEMENT-SPECIFIER-TYPES* or something..) + (let ((stype (specifier-type stype-name))) + (aver (not (unknown-type-p stype))) + (when (csubtypep eltype stype) + (return stype)))))) type)) (defun sb!xc:upgraded-array-element-type (spec &optional environment) @@ -158,16 +143,40 @@ (if (unknown-type-p (specifier-type spec)) (error "undefined type: ~S" spec) (type-specifier (array-type-specialized-element-type - (specifier-type `(array ,spec)))))) + (specifier-type `(array ,spec)))))) + +(defun sb!xc:upgraded-complex-part-type (spec &optional environment) + #!+sb-doc + "Return the element type of the most specialized COMPLEX number type that + can hold parts of type SPEC." + (declare (ignore environment)) + (let ((type (specifier-type spec))) + (cond + ((eq type *empty-type*) nil) + ((unknown-type-p type) (error "undefined type: ~S" spec)) + (t + (let ((ctype (specifier-type `(complex ,spec)))) + (cond + ((eq ctype *empty-type*) '(eql 0)) + ((csubtypep ctype (specifier-type '(complex single-float))) + 'single-float) + ((csubtypep ctype (specifier-type '(complex double-float))) + 'double-float) + #!+long-float + ((csubtypep ctype (specifier-type '(complex long-float))) + 'long-float) + ((csubtypep ctype (specifier-type '(complex rational))) + 'rational) + (t 'real))))))) ;;; Return the most specific integer type that can be quickly checked that ;;; includes the given type. (defun containing-integer-type (subtype) - (dolist (type '(fixnum - (signed-byte 32) - (unsigned-byte 32) - integer) - (error "~S isn't an integer type?" subtype)) + (dolist (type `(fixnum + (signed-byte ,sb!vm:n-word-bits) + (unsigned-byte ,sb!vm:n-word-bits) + integer) + (error "~S isn't an integer type?" subtype)) (when (csubtypep subtype (specifier-type type)) (return type)))) @@ -178,25 +187,29 @@ (typecase type (cons-type (if (type= type (specifier-type 'cons)) - 'sb!c:check-cons - nil)) + 'sb!c:check-cons + nil)) (built-in-classoid (if (type= type (specifier-type 'symbol)) - 'sb!c:check-symbol - nil)) + 'sb!c:check-symbol + nil)) (numeric-type (cond ((type= type (specifier-type 'fixnum)) - 'sb!c:check-fixnum) - ((type= type (specifier-type '(signed-byte 32))) - 'sb!c:check-signed-byte-32) - ((type= type (specifier-type '(unsigned-byte 32))) - 'sb!c:check-unsigned-byte-32) - (t nil))) + 'sb!c:check-fixnum) + #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) + ((type= type (specifier-type '(signed-byte 32))) + 'sb!c:check-signed-byte-32) + #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) + ((type= type (specifier-type '(unsigned-byte 32))) + 'sb!c:check-unsigned-byte-32) + #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) + ((type= type (specifier-type '(signed-byte 64))) + 'sb!c:check-signed-byte-64) + #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) + ((type= type (specifier-type '(unsigned-byte 64))) + 'sb!c:check-unsigned-byte-64) + (t nil))) (fun-type 'sb!c:check-fun) (t nil))) - -(!defun-from-collected-cold-init-forms !vm-type-cold-init) - -(/show0 "vm-type.lisp end of file")