X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ffndb.lisp;h=08a5e0b4c89189bbc55076482f8f25c8201e2b19;hb=c0578d9893429c9c0da80ea5920360e4621fddab;hp=071c8e9b05f8685dd6e3e365beeb83ce417c2c5b;hpb=9b634117911815fbf4154546431b4dcf13e38b47;p=sbcl.git diff --git a/src/compiler/fndb.lisp b/src/compiler/fndb.lisp index 071c8e9..08a5e0b 100644 --- a/src/compiler/fndb.lisp +++ b/src/compiler/fndb.lisp @@ -81,7 +81,7 @@ (sb!xc:deftype name-for-class () t) (defknown classoid-name (classoid) name-for-class (flushable)) -(defknown find-classoid (name-for-class &optional t lexenv-designator) +(defknown find-classoid (name-for-class &optional t) (or classoid null) ()) (defknown classoid-of (t) classoid (flushable)) (defknown layout-of (t) layout (flushable)) @@ -678,8 +678,13 @@ (defknown list-length (list) (or index null) (foldable unsafely-flushable)) (defknown nth (unsigned-byte list) t (foldable flushable)) (defknown nthcdr (unsigned-byte list) t (foldable unsafely-flushable)) + (defknown last (list &optional unsigned-byte) t (foldable flushable)) -(defknown sb!impl::last1 (list) t (foldable flushable)) +(defknown %last0 (list) t (foldable flushable)) +(defknown %last1 (list) t (foldable flushable)) +(defknown %lastn/fixnum (list (and unsigned-byte fixnum)) t (foldable flushable)) +(defknown %lastn/bignum (list (and unsigned-byte bignum)) t (foldable flushable)) + (defknown list (&rest t) list (movable flushable unsafe)) (defknown list* (t &rest t) t (movable flushable unsafe)) (defknown make-list (index &key (:initial-element t)) list @@ -783,7 +788,8 @@ (&key (:test callable) (:size unsigned-byte) (:rehash-size (or (integer 1) (float (1.0)))) (:rehash-threshold (real 0 1)) - (:weakness (member nil :key :value :key-and-value :key-or-value))) + (:weakness (member nil :key :value :key-and-value :key-or-value)) + (:synchronized t)) hash-table (flushable unsafe)) (defknown hash-table-p (t) boolean (movable foldable flushable)) @@ -801,16 +807,14 @@ (defknown clrhash (hash-table) hash-table () :destroyed-constant-args (nth-constant-args 2)) (defknown hash-table-count (hash-table) index (flushable)) -(defknown hash-table-rehash-size (hash-table) (or (integer 1) (float (1.0))) +(defknown hash-table-rehash-size (hash-table) (or index (single-float (1.0))) (foldable flushable)) -(defknown hash-table-rehash-threshold (hash-table) (real 0 1) +(defknown hash-table-rehash-threshold (hash-table) (single-float (0.0) 1.0) (foldable flushable)) (defknown hash-table-size (hash-table) index (flushable)) (defknown hash-table-test (hash-table) symbol (foldable flushable)) -(defknown sxhash (t) (integer 0 #.sb!xc:most-positive-fixnum) - (#-sb-xc-host foldable flushable)) -(defknown psxhash (t &optional t) (integer 0 #.sb!xc:most-positive-fixnum) - (#-sb-xc-host foldable flushable)) +(defknown sxhash (t) hash (#-sb-xc-host foldable flushable)) +(defknown psxhash (t &optional t) hash (#-sb-xc-host foldable flushable)) ;;;; from the "Arrays" chapter @@ -867,7 +871,8 @@ (defknown fill-pointer (vector) index (foldable unsafely-flushable)) (defknown vector-push (t vector) (or index null) () :destroyed-constant-args (nth-constant-args 2)) -(defknown vector-push-extend (t vector &optional index) index () +(defknown vector-push-extend (t vector &optional (and index (integer 1))) + index () :destroyed-constant-args (nth-constant-args 2)) (defknown vector-pop (vector) t () :destroyed-constant-args (nth-constant-args 1)) @@ -907,7 +912,7 @@ simple-string (flushable)) (defknown (string-trim string-left-trim string-right-trim) - (sequence string-designator) simple-string (flushable)) + (sequence string-designator) string (flushable)) (defknown (string-upcase string-downcase string-capitalize) (string-designator &key (:start index) (:end sequence-end)) @@ -976,7 +981,7 @@ (character character &optional readtable (or readtable null)) (eql t) ()) -(defknown set-macro-character (character callable &optional t readtable) +(defknown set-macro-character (character callable &optional t (or readtable null)) (eql t) (unsafe)) (defknown get-macro-character (character &optional (or readtable null)) @@ -985,7 +990,7 @@ (defknown make-dispatch-macro-character (character &optional t readtable) (eql t) ()) (defknown set-dispatch-macro-character - (character character callable &optional readtable) function + (character character callable &optional (or readtable null)) (eql t) (unsafe)) (defknown get-dispatch-macro-character (character character &optional (or readtable null)) (or callable null) @@ -1246,11 +1251,11 @@ &key (:verbose t) (:print t) - (:if-does-not-exist (member :error :create nil)) + (:if-does-not-exist t) (:external-format keyword)) t) -(defknown directory (pathname-designator &key) +(defknown directory (pathname-designator &key (resolve-symlinks t)) list ()) ;;;; from the "Conditions" chapter: @@ -1374,6 +1379,9 @@ ;;;; miscellaneous extensions +(defknown symbol-global-value (symbol) t ()) +(defknown set-symbol-global-value (symbol t) t ()) + (defknown get-bytes-consed () unsigned-byte (flushable)) (defknown mask-signed-field ((integer 0 *) integer) integer (movable flushable foldable)) @@ -1401,7 +1409,9 @@ (defknown %more-arg-context (t t) (values t index) (flushable)) (defknown %more-arg (t index) t) #!+stack-grows-downward-not-upward -(defknown %more-kw-arg (t index) (values t t)) +;;; FIXME: The second argument here should really be NEGATIVE-INDEX, but doing that +;;; breaks the build, and I cannot seem to figure out why. --NS 2006-06-29 +(defknown %more-kw-arg (t fixnum) (values t t)) (defknown %more-arg-values (t index index) * (flushable)) (defknown %verify-arg-count (index index) (values)) (defknown %arg-count-error (t) nil) @@ -1447,14 +1457,19 @@ (defknown hairy-data-vector-set/check-bounds (array index t) t (unsafe explicit-check)) -(defknown %caller-frame-and-pc () (values t t) (flushable)) +(defknown %caller-frame () t (flushable)) +(defknown %caller-pc () system-area-pointer (flushable)) (defknown %with-array-data (array index (or index null)) (values (simple-array * (*)) index index index) (foldable flushable)) +(defknown %with-array-data/fp (array index (or index null)) + (values (simple-array * (*)) index index index) + (foldable flushable)) (defknown %set-symbol-package (symbol t) t (unsafe)) (defknown %coerce-name-to-fun ((or symbol cons)) function (flushable)) (defknown %coerce-callable-to-fun (callable) function (flushable)) -(defknown failed-%with-array-data (t t t) nil) +(defknown array-bounding-indices-bad-error (t t t) nil) +(defknown sequence-bounding-indices-bad-error (t t t) nil) (defknown %find-position (t sequence t index sequence-end function function) (values t (or index null)) @@ -1470,6 +1485,15 @@ function (flushable foldable)) +(defknown %adjoin (t list) list (explicit-check foldable flushable)) +(defknown %adjoin-key (t list function) list (explicit-check foldable flushable call)) +(defknown %assoc (t list) list (explicit-check foldable flushable)) +(defknown %assoc-key (t list function) list (explicit-check foldable flushable call)) +(defknown %member (t list) list (explicit-check foldable flushable)) +(defknown %member-key (t list function) list (explicit-check foldable flushable call)) +(defknown %rassoc (t list) list (explicit-check foldable flushable)) +(defknown %rassoc-key (t list function) list (explicit-check foldable flushable call)) + (defknown %check-vector-sequence-bounds (vector index sequence-end) index (unwind)) @@ -1507,7 +1531,7 @@ :destroyed-constant-args (nth-constant-args 1)) (defknown %set-symbol-value (symbol t) t (unsafe)) (defknown (setf symbol-function) (function symbol) function (unsafe)) -(defknown %set-symbol-plist (symbol t) t (unsafe)) +(defknown %set-symbol-plist (symbol list) list (unsafe)) (defknown (setf fdocumentation) ((or string null) t symbol) (or string null) ()) @@ -1518,10 +1542,10 @@ ;;;; ALIEN and call-out-to-C stuff -;;; 'unsafe' attribute because we store the arg on the stack, which is in -;;; some sense 'passing it upwards' -(defknown sb!vm::push-word-on-c-stack (system-area-pointer) (values) (unsafe)) -(defknown sb!vm::pop-words-from-c-stack (index) (values) ()) +;; Used by WITH-PINNED-OBJECTS +#!+(or x86 x86-64) +(defknown sb!vm::touch-object (t) (values) + (unsafe always-translatable)) #!+linkage-table (defknown foreign-symbol-dataref-sap (simple-string) @@ -1545,16 +1569,16 @@ (flushable)) (defknown compiler-error (t &rest t) nil ()) -(defknown (compiler-warn compiler-style-warn) (string &rest t) (values) ()) +(defknown (compiler-warn compiler-style-warn) (t &rest t) (values) ()) (defknown (compiler-notify maybe-compiler-notify) ((or string symbol) &rest t) (values) ()) -(defknown style-warn (string &rest t) null ()) +(defknown style-warn (t &rest t) null ()) ;;;; atomic ops -#!+(or x86 x86-64) -(progn - (defknown %simple-vector-compare-and-swap (simple-vector index t t) t - (unsafe)) - (defknown %instance-compare-and-swap (instance index t t) t - (unsafe))) +(defknown %compare-and-swap-svref (simple-vector index t t) t + (unsafe)) +(defknown %compare-and-swap-instance-ref (instance index t t) t + (unsafe)) +(defknown %compare-and-swap-symbol-value (symbol t t) t + (unsafe unwind))