X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=8976ed211b4d033d7befaaaf13116917402fdde8;hb=988c0c0982e8ebb891da9241c71b5f8350448350;hp=81ff0304ca2f3791ad170e66c26bf147e577aa8f;hpb=8cbd7fc0f27222a778ce61bae7d943a5081362cc;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 81ff030..8976ed2 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -20,7 +20,7 @@ complex-rational-p complex-float-p complex-single-float-p complex-double-float-p #!+long-float complex-long-float-p complex-vector-p - base-char-p %standard-char-p %instancep + base-char-p %standard-char-p %instancep %other-pointer-p base-string-p simple-base-string-p #!+sb-unicode character-string-p #!+sb-unicode simple-character-string-p @@ -63,29 +63,43 @@ unsigned-byte-64-p #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) signed-byte-64-p - vector-t-p weak-pointer-p code-component-p lra-p + weak-pointer-p code-component-p lra-p funcallable-instance-p) (t) boolean (movable foldable flushable)) +(defknown #.(loop for (name) in *vector-without-complex-typecode-infos* + collect name) + (t) boolean (movable foldable flushable)) ;;;; miscellaneous "sub-primitives" +(defknown pointer-hash (t) hash (flushable)) + (defknown %sp-string-compare (simple-string index index simple-string index index) (or index null) (foldable flushable)) -(defknown %sxhash-simple-string (simple-string) index +(defknown %sxhash-simple-string (simple-string) hash (foldable flushable)) -(defknown %sxhash-simple-substring (simple-string index) index +(defknown %sxhash-simple-substring (simple-string index) hash (foldable flushable)) -(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum) +(defknown symbol-hash (symbol) hash (flushable movable)) -(defknown %set-symbol-hash (symbol (integer 0 #.sb!xc:most-positive-fixnum)) +(defknown %set-symbol-hash (symbol hash) t (unsafe)) +(defknown initialize-vector ((simple-array * (*)) &rest t) + (simple-array * (*)) + (always-translatable flushable) + :result-arg 0) + +(defknown vector-fill* (t t t t) vector + (unsafe) + :result-arg 0) + (defknown vector-length (vector) index (flushable)) (defknown vector-sap ((simple-unboxed-array (*))) system-area-pointer @@ -109,7 +123,9 @@ (flushable)) (defknown %make-instance (index) instance - (unsafe)) + (flushable)) +(defknown %make-structure-instance (defstruct-description list &rest t) instance + (flushable always-translatable)) (defknown %instance-layout (instance) layout (foldable flushable)) (defknown %set-instance-layout (instance layout) layout @@ -122,8 +138,6 @@ (unsafe always-translatable)) (defknown %layout-invalid-error (t layout) nil) -#!-hppa -(progn (defknown %raw-instance-ref/word (instance index) sb!vm:word (flushable always-translatable)) (defknown %raw-instance-set/word (instance index sb!vm:word) sb!vm:word @@ -150,64 +164,11 @@ (instance index (complex double-float)) (complex double-float) (unsafe always-translatable)) -) - -;;; %RAW-{REF,SET}-FOO VOPs should be declared as taking a RAW-VECTOR -;;; as their first argument (clarity and to match these DEFKNOWNs). -;;; We declare RAW-VECTOR as a primitive type so the VOP machinery -;;; will accept our VOPs as legitimate. --njf, 2004-08-10 -;;; -;;; These are only used on HPPA, since on HPPA implements raw slots in -;;; structures with an indirection vector; all other ports implement -;;; raw slots directly in the structure. --njf, 2006-06-02 -#!+hppa -(progn -(sb!xc:deftype raw-vector () '(simple-array sb!vm:word (*))) - -(sb!vm::!def-primitive-type-alias raw-vector - #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) - sb!vm::simple-array-unsigned-byte-32 - #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) - sb!vm::simple-array-unsigned-byte-64) - -(defknown %raw-ref-single (raw-vector index) single-float - (foldable flushable always-translatable)) -(defknown %raw-ref-double (raw-vector index) double-float - (foldable flushable always-translatable)) -#!+long-float -(defknown %raw-ref-long (raw-vector index) long-float - (foldable flushable always-translatable)) -(defknown %raw-set-single (raw-vector index single-float) single-float - (unsafe always-translatable)) -(defknown %raw-set-double (raw-vector index double-float) double-float - (unsafe always-translatable)) -#!+long-float -(defknown %raw-set-long (raw-vector index long-float) long-float - (unsafe always-translatable)) -(defknown %raw-ref-complex-single (raw-vector index) (complex single-float) - (foldable flushable always-translatable)) -(defknown %raw-ref-complex-double (raw-vector index) (complex double-float) - (foldable flushable always-translatable)) +#!+(or x86 x86-64 ppc) +(defknown %raw-instance-atomic-incf/word (instance index sb!vm:word) sb!vm:word + (unsafe always-translatable)) -(defknown %raw-set-complex-single (raw-vector index (complex single-float)) - (complex single-float) - (unsafe always-translatable)) -(defknown %raw-set-complex-double (raw-vector index (complex double-float)) - (complex double-float) - (unsafe always-translatable)) -) - -(defknown %raw-bits (t fixnum) sb!vm:word - (foldable flushable)) -#!+x86 -(defknown %raw-bits-with-offset (t fixnum fixnum) sb!vm:word - (flushable always-translatable)) -(defknown (%set-raw-bits) (t fixnum sb!vm:word) sb!vm:word - (unsafe)) -#!+x86 -(defknown (%set-raw-bits-with-offset) (t fixnum fixnum sb!vm:word) sb!vm:word - (unsafe always-translatable)) ;;; These two are mostly used for bit-bashing operations. (defknown %vector-raw-bits (t fixnum) sb!vm:word (flushable)) @@ -252,16 +213,12 @@ (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 (sb!vm:word) t (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) sb!vm:word sb!vm:word) - sb!vm:word - (foldable flushable movable)) - (defknown word-logical-not (sb!vm:word) sb!vm:word (foldable flushable movable)) @@ -290,14 +247,14 @@ (defknown %bignum-ref (bignum-type bignum-index) bignum-element-type (flushable)) -#!+x86 +#!+(or x86 x86-64) (defknown %bignum-ref-with-offset (bignum-type bignum-index (signed-byte 24)) bignum-element-type (flushable always-translatable)) (defknown %bignum-set (bignum-type bignum-index bignum-element-type) bignum-element-type (unsafe)) -#!+x86 +#!+(or x86 x86-64) (defknown %bignum-set-with-offset (bignum-type bignum-index (signed-byte 24) bignum-element-type) bignum-element-type (unsafe always-translatable))