X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=e2264f1e04ca6dc996a8a86fd9e62b06599c351e;hb=ace140856e6b3f92bb06597092a59753f1e59142;hp=4ade63d6d379170adda2cdcb2632f1cc2a719f58;hpb=4eb1a6d3ad2b7dcc19ac0ec979a1eb1eb049659a;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 4ade63d..e2264f1 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -21,10 +21,15 @@ complex-double-float-p #!+long-float complex-long-float-p complex-vector-p base-char-p %standard-char-p %instancep + base-string-p simple-base-string-p array-header-p - simple-array-p simple-array-unsigned-byte-2-p - simple-array-unsigned-byte-4-p simple-array-unsigned-byte-8-p - simple-array-unsigned-byte-16-p simple-array-unsigned-byte-32-p + simple-array-p simple-array-nil-p vector-nil-p + simple-array-unsigned-byte-2-p + simple-array-unsigned-byte-4-p simple-array-unsigned-byte-7-p + simple-array-unsigned-byte-8-p simple-array-unsigned-byte-15-p + simple-array-unsigned-byte-16-p simple-array-unsigned-byte-29-p + simple-array-unsigned-byte-31-p + simple-array-unsigned-byte-32-p simple-array-signed-byte-8-p simple-array-signed-byte-16-p simple-array-signed-byte-30-p simple-array-signed-byte-32-p simple-array-single-float-p simple-array-double-float-p @@ -50,6 +55,12 @@ (defknown %sxhash-simple-substring (simple-string index) index (foldable flushable)) +(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum) + (flushable movable)) + +(defknown %set-symbol-hash (symbol (integer 0 #.sb!xc:most-positive-fixnum)) + t (unsafe)) + (defknown vector-length (vector) index (flushable)) (defknown vector-sap ((simple-unboxed-array (*))) system-area-pointer @@ -65,6 +76,12 @@ (defknown set-header-data (t (unsigned-byte 24)) t (unsafe)) +(defknown %array-dimension (t index) index + (flushable)) +(defknown %set-array-dimension (t index index) index + ()) +(defknown %array-rank (t) index + (flushable)) (defknown %make-instance (index) instance (unsafe)) @@ -81,7 +98,7 @@ (defknown %layout-invalid-error (t layout) nil) -(sb!xc:deftype raw-vector () '(simple-array (unsigned-byte 32) (*))) +(sb!xc:deftype raw-vector () '(simple-array sb!vm:word (*))) (defknown %raw-ref-single (raw-vector index) single-float (foldable flushable)) @@ -102,23 +119,18 @@ (foldable flushable)) (defknown %raw-ref-complex-double (raw-vector index) (complex double-float) (foldable flushable)) -#!+long-float -(defknown %raw-ref-complex-long (raw-vector index) (complex long-float) - (foldable flushable)) + (defknown %raw-set-complex-single (raw-vector index (complex single-float)) (complex single-float) (unsafe)) (defknown %raw-set-complex-double (raw-vector index (complex double-float)) (complex double-float) (unsafe)) -#!+long-float -(defknown %raw-set-complex-long (raw-vector index (complex long-float)) - (complex long-float) - (unsafe)) -(defknown %raw-bits (t fixnum) (unsigned-byte 32) + +(defknown %raw-bits (t fixnum) sb!vm:word (foldable flushable)) -(defknown (%set-raw-bits) (t fixnum (unsigned-byte 32)) (unsigned-byte 32) +(defknown (%set-raw-bits) (t fixnum sb!vm:word) sb!vm:word (unsafe)) @@ -152,46 +164,46 @@ (defknown %set-stack-ref (system-area-pointer index t) t (unsafe)) (defknown lra-code-header (t) t (movable flushable)) (defknown fun-code-header (t) t (movable flushable)) -(defknown make-lisp-obj ((unsigned-byte 32)) t (movable flushable)) -(defknown get-lisp-obj-address (t) (unsigned-byte 32) (movable flushable)) +(defknown make-lisp-obj (sb!vm:word) t (movable flushable)) +(defknown get-lisp-obj-address (t) sb!vm:word (movable flushable)) (defknown fun-word-offset (function) index (movable flushable)) ;;;; 32-bit logical operations -(defknown merge-bits ((unsigned-byte 5) (unsigned-byte 32) (unsigned-byte 32)) - (unsigned-byte 32) +(defknown merge-bits ((unsigned-byte 5) sb!vm:word sb!vm:word) + sb!vm:word (foldable flushable movable)) -(defknown 32bit-logical-not ((unsigned-byte 32)) (unsigned-byte 32) +(defknown word-logical-not (sb!vm:word) sb!vm:word (foldable flushable movable)) -(defknown (32bit-logical-and 32bit-logical-nand - 32bit-logical-or 32bit-logical-nor - 32bit-logical-xor 32bit-logical-eqv - 32bit-logical-andc1 32bit-logical-andc2 - 32bit-logical-orc1 32bit-logical-orc2) - ((unsigned-byte 32) (unsigned-byte 32)) (unsigned-byte 32) +(defknown (word-logical-and word-logical-nand + word-logical-or word-logical-nor + word-logical-xor word-logical-eqv + word-logical-andc1 word-logical-andc2 + word-logical-orc1 word-logical-orc2) + (sb!vm:word sb!vm:word) sb!vm:word (foldable flushable movable)) -(defknown (shift-towards-start shift-towards-end) ((unsigned-byte 32) fixnum) - (unsigned-byte 32) +(defknown (shift-towards-start shift-towards-end) (sb!vm:word fixnum) + sb!vm:word (foldable flushable movable)) ;;;; bignum operations -(defknown %allocate-bignum (bignum-index) bignum-widetag +(defknown %allocate-bignum (bignum-index) bignum-type (flushable)) -(defknown %bignum-length (bignum-widetag) bignum-index +(defknown %bignum-length (bignum-type) bignum-index (foldable flushable movable)) -(defknown %bignum-set-length (bignum-widetag bignum-index) bignum-widetag +(defknown %bignum-set-length (bignum-type bignum-index) bignum-type (unsafe)) -(defknown %bignum-ref (bignum-widetag bignum-index) bignum-element-type +(defknown %bignum-ref (bignum-type bignum-index) bignum-element-type (flushable)) -(defknown %bignum-set (bignum-widetag bignum-index bignum-element-type) +(defknown %bignum-set (bignum-type bignum-index bignum-element-type) bignum-element-type (unsafe)) @@ -239,23 +251,23 @@ (defknown copy-to-system-area ((simple-unboxed-array (*)) index system-area-pointer index index) - null + (values) ()) (defknown copy-from-system-area (system-area-pointer index (simple-unboxed-array (*)) index index) - null + (values) ()) (defknown system-area-copy (system-area-pointer index system-area-pointer index index) - null + (values) ()) (defknown bit-bash-copy ((simple-unboxed-array (*)) index (simple-unboxed-array (*)) index index) - null + (values) ()) ;;; (not really a bit-bashing routine, but starting to take over from @@ -263,7 +275,7 @@ (defknown %byte-blt ((or (simple-unboxed-array (*)) system-area-pointer) index (or (simple-unboxed-array (*)) system-area-pointer) index index) - null + (values) ()) ;;;; code/function/fdefn object manipulation routines @@ -272,9 +284,9 @@ (defknown code-header-ref (t index) t (flushable)) (defknown code-header-set (t index t) t ()) -(defknown function-subtype (function) (unsigned-byte #.sb!vm:n-widetag-bits) +(defknown fun-subtype (function) (unsigned-byte #.sb!vm:n-widetag-bits) (flushable)) -(defknown ((setf function-subtype)) +(defknown ((setf fun-subtype)) ((unsigned-byte #.sb!vm:n-widetag-bits) function) (unsigned-byte #.sb!vm:n-widetag-bits) ()) @@ -306,3 +318,7 @@ ;;;; mutator accessors (defknown mutator-self () system-area-pointer (flushable movable)) + +(defknown %data-vector-and-index (array index) + (values (simple-array * (*)) index) + (foldable flushable))