X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ffndb.lisp;h=2086cf47264d8534a52670d792d4da063e60b14a;hb=95009657265e2af674bdfa9ce7dc75d819976e5b;hp=8bea7e421fb5f8d2359060e2209db89b16566c2a;hpb=79df11a5e57e23f1e079e60420ff6d058af7a725;p=sbcl.git diff --git a/src/compiler/fndb.lisp b/src/compiler/fndb.lisp index 8bea7e4..2086cf4 100644 --- a/src/compiler/fndb.lisp +++ b/src/compiler/fndb.lisp @@ -80,7 +80,7 @@ ;;;; classes (sb!xc:deftype name-for-class () t) -(defknown classoid-name (classoid) name-for-class (flushable)) +(defknown classoid-name (classoid) symbol (flushable)) (defknown find-classoid (name-for-class &optional t) (or classoid null) ()) (defknown classoid-of (t) classoid (flushable)) @@ -142,7 +142,8 @@ (defknown macro-function (symbol &optional lexenv-designator) (or function null) (flushable)) -(defknown (macroexpand macroexpand-1) (t &optional lexenv-designator) +(defknown (macroexpand macroexpand-1 %macroexpand %macroexpand-1) + (t &optional lexenv-designator) (values form &optional boolean)) (defknown compiler-macro-function (t &optional lexenv-designator) @@ -326,18 +327,18 @@ (movable foldable flushable explicit-check)) (defknown decode-float (float) (values float float-exponent float) - (movable foldable flushable explicit-check)) + (movable foldable unsafely-flushable explicit-check)) (defknown scale-float (float integer) float (movable foldable unsafely-flushable explicit-check)) (defknown float-radix (float) float-radix - (movable foldable flushable)) + (movable foldable unsafely-flushable)) (defknown float-sign (float &optional float) float - (movable foldable flushable explicit-check)) + (movable foldable unsafely-flushable explicit-check)) (defknown (float-digits float-precision) (float) float-digits - (movable foldable flushable explicit-check)) + (movable foldable unsafely-flushable explicit-check)) (defknown integer-decode-float (float) - (values integer float-int-exponent (member -1 1)) - (movable foldable flushable explicit-check)) + (values integer float-int-exponent (member -1 1)) + (movable foldable unsafely-flushable explicit-check)) (defknown complex (real &optional real) number (movable foldable flushable explicit-check)) @@ -380,8 +381,12 @@ (defknown deposit-field (integer byte-specifier integer) integer (movable foldable flushable)) (defknown random ((or (float (0.0)) (integer 1)) &optional random-state) - (or (float 0.0) (integer 0)) ()) -(defknown make-random-state (&optional (or (member nil t) random-state)) + (or (float 0.0) (integer 0)) + (explicit-check)) +(defknown make-random-state (&optional + (or (member nil t) random-state unsigned-byte + (simple-array (unsigned-byte 8) (*)) + (simple-array (unsigned-byte 32) (*)))) random-state (flushable)) (defknown random-state-p (t) boolean (movable foldable flushable)) @@ -790,6 +795,7 @@ (&key (:test callable) (:size unsigned-byte) (:rehash-size (or (integer 1) (float (1.0)))) (:rehash-threshold (real 0 1)) + (:hash-function (or null callable)) (:weakness (member nil :key :value :key-and-value :key-or-value)) (:synchronized t)) hash-table @@ -870,13 +876,16 @@ (defknown array-has-fill-pointer-p (array) boolean (movable foldable flushable)) -(defknown fill-pointer (vector) index (foldable unsafely-flushable)) -(defknown vector-push (t vector) (or index null) () +(defknown fill-pointer (complex-vector) index + (unsafely-flushable explicit-check)) +(defknown vector-push (t complex-vector) (or index null) + (explicit-check) :destroyed-constant-args (nth-constant-args 2)) -(defknown vector-push-extend (t vector &optional (and index (integer 1))) - index () +(defknown vector-push-extend (t complex-vector &optional (and index (integer 1))) index + (explicit-check) :destroyed-constant-args (nth-constant-args 2)) -(defknown vector-pop (vector) t () +(defknown vector-pop (complex-vector) t + (explicit-check) :destroyed-constant-args (nth-constant-args 1)) ;;; FIXME: complicated :DESTROYED-CONSTANT-ARGS @@ -958,7 +967,7 @@ (flushable unsafe)) (defknown make-string-output-stream (&key (:element-type type-specifier)) - stream + string-output-stream (flushable)) (defknown get-output-stream-string (stream) simple-string ()) (defknown streamp (t) boolean (movable foldable flushable)) @@ -1231,7 +1240,7 @@ :rename-and-delete :overwrite :append :supersede nil)) (:if-does-not-exist (member :error :create nil)) - (:external-format keyword)) + (:external-format external-format-designator)) (or stream null)) (defknown rename-file (pathname-designator filename) @@ -1254,24 +1263,19 @@ (:verbose t) (:print t) (:if-does-not-exist t) - (:external-format keyword)) + (:external-format external-format-designator)) t) -(defknown directory (pathname-designator &key (resolve-symlinks t)) +(defknown directory (pathname-designator &key (:resolve-symlinks t)) list ()) ;;;; from the "Conditions" chapter: -(defknown cell-error-name (cell-error) t) (defknown error (t &rest t) nil) (defknown cerror (format-control t &rest t) null) (defknown invalid-method-error (t format-control &rest t) *) ; FIXME: first arg is METHOD (defknown method-combination-error (format-control &rest t) *) (defknown signal (t &rest t) null) -(defknown simple-condition-format-control (condition) - format-control) -(defknown simple-condition-format-arguments (condition) - list) (defknown warn (t &rest t) null) (defknown invoke-debugger (condition) nil) (defknown break (&optional format-control &rest t) null) @@ -1288,7 +1292,9 @@ null) ;;; and analogous SBCL extension: +(defknown sb!impl::%failed-aver (t) nil) (defknown bug (t &rest t) nil) ; never returns + ;;;; from the "Miscellaneous" Chapter: @@ -1306,11 +1312,12 @@ (member t))) (:verbose t) (:print t) - (:external-format keyword) + (:external-format external-format-designator) ;; extensions (:trace-file t) - (:block-compile t)) + (:block-compile t) + (:emit-cfasl t)) (values (or pathname null) boolean boolean)) ;; FIXME: consider making (OR CALLABLE CONS) something like @@ -1319,10 +1326,6 @@ (:stream stream) (:use-labels t)) null) -(defknown fdocumentation (t symbol) - (or string null) - (flushable)) - (defknown describe (t &optional (or stream (member t nil))) (values)) (defknown inspect (t) (values)) (defknown room (&optional (member t nil :default)) (values)) @@ -1388,21 +1391,22 @@ (defknown mask-signed-field ((integer 0 *) integer) integer (movable flushable foldable)) -;;; PCOUNTERs -(defknown incf-pcounter (pcounter unsigned-byte) pcounter) -(defknown pcounter->integer (pcounter) unsigned-byte) -(defknown %incf-pcounter-or-fixnum ((or pcounter fixnum) unsigned-byte) - (or pcounter fixnum)) -(defknown pcounter-or-fixnum->integer ((or pcounter fixnum)) unsigned-byte) +(defknown array-storage-vector (array) (simple-array * (*)) + (any)) ;;;; magical compiler frobs +(defknown %values-list-or-context (t t t) * (always-translatable)) + +(defknown %unary-truncate/single-float (single-float) integer (movable foldable flushable)) +(defknown %unary-truncate/double-float (double-float) integer (movable foldable flushable)) + ;;; We can't fold this in general because of SATISFIES. There is a ;;; special optimizer anyway. (defknown %typep (t (or type-specifier ctype)) boolean (movable flushable explicit-check)) (defknown %instance-typep (t (or type-specifier ctype)) boolean - (movable flushable explicit-check)) + (movable flushable explicit-check always-translatable)) (defknown %cleanup-point () t) (defknown %special-bind (t t) t) @@ -1433,7 +1437,8 @@ ;; FIXME: This function does not return, but due to the implementation ;; of FILTER-LVAR we cannot write it here. -(defknown %compile-time-type-error (t t t) *) +(defknown %compile-time-type-error (t t t t) *) +(defknown sb!kernel::case-failure (t t t) nil) (defknown %odd-key-args-error () nil) (defknown %unknown-key-arg-error (t) nil) @@ -1534,12 +1539,10 @@ (defknown %set-symbol-value (symbol t) t (unsafe)) (defknown (setf symbol-function) (function symbol) function (unsafe)) (defknown %set-symbol-plist (symbol list) list (unsafe)) -(defknown (setf fdocumentation) ((or string null) t symbol) - (or string null) - ()) (defknown %setnth (unsigned-byte list t) t (unsafe) :destroyed-constant-args (nth-constant-args 2)) -(defknown %set-fill-pointer (vector index) index (unsafe) +(defknown %set-fill-pointer (complex-vector index) index + (unsafe explicit-check) :destroyed-constant-args (nth-constant-args 1)) ;;;; ALIEN and call-out-to-C stuff @@ -1577,6 +1580,16 @@ ()) (defknown style-warn (t &rest t) null ()) + +;;;; memory barriers + +(defknown sb!vm:%compiler-barrier () (values) ()) +(defknown sb!vm:%memory-barrier () (values) ()) +(defknown sb!vm:%read-barrier () (values) ()) +(defknown sb!vm:%write-barrier () (values) ()) +(defknown sb!vm:%data-dependency-barrier () (values) ()) + + ;;;; atomic ops (defknown %compare-and-swap-svref (simple-vector index t t) t (unsafe))