X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=90716af77b373c89bf1a4a1ae57f0a7725ea6f45;hb=aadc8391153b7b939462752dfa3f8dec49b2eba1;hp=28b263b5f8d9ca6a511fca635c5bc73b7defc417;hpb=880a863592743d82835e0fb4395301d6ab1f5127;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 28b263b..90716af 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -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,12 @@ 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" @@ -76,18 +77,27 @@ (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 @@ -126,8 +136,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 @@ -153,68 +161,15 @@ (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)) - -;;; %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)) -(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) +#!+(or x86 x86-64 ppc) +(defknown %raw-instance-atomic-incf/word (instance index sb!vm:word) sb!vm:word + (unsafe always-translatable)) +#!+(or x86 x86-64 ppc) +(defknown %array-atomic-incf/word (t index sb!vm:word) sb!vm:word (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)) @@ -241,11 +196,6 @@ ;;;; threading -#!+(and sb-lutex sb-thread) -(progn - (defknown sb!vm::%make-lutex () sb!vm::lutex ()) - (defknown sb!vm::lutexp (t) boolean (foldable flushable))) - (defknown (dynamic-space-free-pointer binding-stack-pointer-sap control-stack-pointer-sap) () system-area-pointer @@ -265,10 +215,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)) @@ -337,7 +283,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))