X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=37273c115c0957593337e2e4c281d432656bfb6d;hb=0b3f5cc5fa9e6b121d232960ccd964d2eb15f695;hp=2c8857121cf8233e1f0cac903cfb1b2b7433535f;hpb=edcaad65452eee6bff2017941ef6c33b26a5a2b0;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 2c88571..37273c1 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 %other-pointer-p + base-char-p %standard-char-p %instancep base-string-p simple-base-string-p #!+sb-unicode character-string-p #!+sb-unicode simple-character-string-p @@ -31,23 +31,21 @@ 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 - #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) - simple-array-unsigned-byte-29-p + + simple-array-unsigned-fixnum-p + simple-array-unsigned-byte-31-p simple-array-unsigned-byte-32-p #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) - simple-array-unsigned-byte-60-p - #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) simple-array-unsigned-byte-63-p #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) simple-array-unsigned-byte-64-p simple-array-signed-byte-8-p simple-array-signed-byte-16-p - #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) - simple-array-signed-byte-30-p + + simple-array-fixnum-p + simple-array-signed-byte-32-p #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) - simple-array-signed-byte-61-p - #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) simple-array-signed-byte-64-p simple-array-single-float-p simple-array-double-float-p #!+long-float simple-array-long-float-p @@ -63,9 +61,17 @@ 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)) + +(defknown %other-pointer-p (t) boolean + (movable foldable flushable always-translatable)) + ;;;; miscellaneous "sub-primitives" @@ -76,19 +82,28 @@ (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)) - t (unsafe)) +(defknown %set-symbol-hash (symbol hash) + t ()) + +(defknown initialize-vector ((simple-array * (*)) &rest t) + (simple-array * (*)) + (always-translatable flushable) + :result-arg 0) -(defknown vector-length (vector) index (flushable)) +(defknown vector-fill* (t t t t) vector + () + :result-arg 0) + +(defknown vector-length (vector) index (flushable dx-safe)) (defknown vector-sap ((simple-unboxed-array (*))) system-area-pointer (flushable)) @@ -101,7 +116,7 @@ (defknown (get-header-data get-closure-length) (t) (unsigned-byte 24) (flushable)) (defknown set-header-data (t (unsigned-byte 24)) t - (unsafe)) + ()) (defknown %array-dimension (t index) index (flushable)) @@ -117,66 +132,54 @@ (defknown %instance-layout (instance) layout (foldable flushable)) (defknown %set-instance-layout (instance layout) layout - (unsafe)) + ()) (defknown %instance-length (instance) index (foldable flushable)) (defknown %instance-ref (instance index) t (flushable always-translatable)) (defknown %instance-set (instance index t) t - (unsafe always-translatable)) + (always-translatable)) (defknown %layout-invalid-error (t layout) nil) (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 - (unsafe always-translatable)) + (always-translatable)) (defknown %raw-instance-ref/single (instance index) single-float (flushable always-translatable)) (defknown %raw-instance-set/single (instance index single-float) single-float - (unsafe always-translatable)) + (always-translatable)) (defknown %raw-instance-ref/double (instance index) double-float (flushable always-translatable)) (defknown %raw-instance-set/double (instance index double-float) double-float - (unsafe always-translatable)) + (always-translatable)) (defknown %raw-instance-ref/complex-single (instance index) (complex single-float) (flushable always-translatable)) (defknown %raw-instance-set/complex-single (instance index (complex single-float)) (complex single-float) - (unsafe always-translatable)) + (always-translatable)) (defknown %raw-instance-ref/complex-double (instance index) (complex double-float) (flushable always-translatable)) (defknown %raw-instance-set/complex-double (instance index (complex double-float)) (complex double-float) - (unsafe always-translatable)) - -#!+(or x86 x86-64) -(defknown %raw-instance-atomic-incf/word (instance index sb!vm:signed-word) sb!vm:word - (unsafe always-translatable)) + (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 +#!+(or x86 x86-64 ppc) +(defknown %raw-instance-atomic-incf/word (instance index sb!vm:word) sb!vm:word + (always-translatable)) +#!+(or x86 x86-64 ppc) +(defknown %array-atomic-incf/word (t index sb!vm:word) sb!vm:word + (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)) (defknown (%set-vector-raw-bits) (t fixnum sb!vm:word) sb!vm:word - (unsafe)) + ()) (defknown allocate-vector ((unsigned-byte 8) index index) (simple-array * (*)) @@ -196,12 +199,45 @@ (defknown make-value-cell (t) t (flushable movable)) -;;;; threading - -#!+(and sb-lutex sb-thread) +#!+sb-simd-pack (progn - (defknown sb!vm::%make-lutex () sb!vm::lutex ()) - (defknown sb!vm::lutexp (t) boolean (foldable flushable))) + (defknown simd-pack-p (t) boolean (foldable movable flushable)) + (defknown %simd-pack-tag (simd-pack) fixnum (movable flushable)) + (defknown %make-simd-pack (fixnum (unsigned-byte 64) (unsigned-byte 64)) + simd-pack + (flushable movable foldable)) + (defknown %make-simd-pack-double (double-float double-float) + (simd-pack double-float) + (flushable movable foldable)) + (defknown %make-simd-pack-single (single-float single-float + single-float single-float) + (simd-pack single-float) + (flushable movable foldable)) + (defknown %make-simd-pack-ub32 ((unsigned-byte 32) (unsigned-byte 32) + (unsigned-byte 32) (unsigned-byte 32)) + (simd-pack integer) + (flushable movable foldable)) + (defknown %make-simd-pack-ub64 ((unsigned-byte 64) (unsigned-byte 64)) + (simd-pack integer) + (flushable movable foldable)) + (defknown (%simd-pack-low %simd-pack-high) (simd-pack) + (unsigned-byte 64) + (flushable movable foldable)) + (defknown %simd-pack-ub32s (simd-pack) + (values (unsigned-byte 32) (unsigned-byte 32) + (unsigned-byte 32) (unsigned-byte 32)) + (flushable movable foldable)) + (defknown %simd-pack-ub64s (simd-pack) + (values (unsigned-byte 64) (unsigned-byte 64)) + (flushable movable foldable)) + (defknown %simd-pack-singles (simd-pack) + (values single-float single-float single-float single-float) + (flushable movable foldable)) + (defknown %simd-pack-doubles (simd-pack) + (values double-float double-float) + (flushable movable foldable))) + +;;;; threading (defknown (dynamic-space-free-pointer binding-stack-pointer-sap control-stack-pointer-sap) () @@ -213,7 +249,7 @@ (defknown current-sp () system-area-pointer (movable flushable)) (defknown current-fp () system-area-pointer (movable flushable)) (defknown stack-ref (system-area-pointer index) t (flushable)) -(defknown %set-stack-ref (system-area-pointer index t) t (unsafe)) +(defknown %set-stack-ref (system-area-pointer index t) t ()) (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)) @@ -222,10 +258,6 @@ ;;;; 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)) @@ -250,7 +282,7 @@ (foldable flushable movable)) (defknown %bignum-set-length (bignum-type bignum-index) bignum-type - (unsafe)) + ()) (defknown %bignum-ref (bignum-type bignum-index) bignum-element-type (flushable)) @@ -260,11 +292,11 @@ (defknown %bignum-set (bignum-type bignum-index bignum-element-type) bignum-element-type - (unsafe)) + ()) #!+(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)) + bignum-element-type (always-translatable)) (defknown %digit-0-or-plusp (bignum-element-type) boolean (foldable flushable movable)) @@ -294,7 +326,7 @@ (defknown %fixnum-to-digit (fixnum) bignum-element-type (foldable flushable movable)) -(defknown %floor (bignum-element-type bignum-element-type bignum-element-type) +(defknown %bigfloor (bignum-element-type bignum-element-type bignum-element-type) (values bignum-element-type bignum-element-type) (foldable flushable movable)) @@ -362,13 +394,13 @@ (defknown fdefn-p (t) boolean (movable foldable flushable)) (defknown fdefn-name (fdefn) t (foldable flushable)) (defknown fdefn-fun (fdefn) (or function null) (flushable)) -(defknown (setf fdefn-fun) (function fdefn) t (unsafe)) +(defknown (setf fdefn-fun) (function fdefn) t ()) (defknown fdefn-makunbound (fdefn) t ()) (defknown %simple-fun-self (function) function (flushable)) (defknown (setf %simple-fun-self) (function function) function - (unsafe)) + ()) (defknown %closure-fun (function) function (flushable)) @@ -377,10 +409,10 @@ (flushable)) (defknown %make-funcallable-instance (index) function - (unsafe)) + ()) (defknown %funcallable-instance-info (function index) t (flushable)) -(defknown %set-funcallable-instance-info (function index t) t (unsafe)) +(defknown %set-funcallable-instance-info (function index t) t ()) ;;;; mutator accessors