X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=37273c115c0957593337e2e4c281d432656bfb6d;hb=0b3f5cc5fa9e6b121d232960ccd964d2eb15f695;hp=a2c9d35994dba4352b9bd755665d6b1d954379b5;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index a2c9d35..37273c1 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -16,44 +16,43 @@ ;;; Simple TYPEP uses that don't have any standard predicate are ;;; translated into non-standard unary predicates. (defknown (fixnump bignump ratiop - short-float-p single-float-p double-float-p long-float-p - 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-string-p simple-base-string-p + short-float-p single-float-p double-float-p long-float-p + 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-string-p simple-base-string-p #!+sb-unicode character-string-p #!+sb-unicode simple-character-string-p - array-header-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 - #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) - simple-array-unsigned-byte-29-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 + array-header-p + sequencep extended-sequence-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-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-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-signed-byte-8-p simple-array-signed-byte-16-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 - simple-array-complex-single-float-p - simple-array-complex-double-float-p - #!+long-float simple-array-complex-long-float-p - system-area-pointer-p realp + simple-array-single-float-p simple-array-double-float-p + #!+long-float simple-array-long-float-p + simple-array-complex-single-float-p + simple-array-complex-double-float-p + #!+long-float simple-array-complex-long-float-p + system-area-pointer-p realp ;; #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) unsigned-byte-32-p ;; #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) @@ -62,30 +61,49 @@ 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 - funcallable-instance-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" +(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)) - 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)) @@ -98,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)) @@ -108,64 +126,60 @@ (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 - (unsafe)) + ()) (defknown %instance-length (instance) index (foldable flushable)) (defknown %instance-ref (instance index) t - (flushable)) + (flushable always-translatable)) (defknown %instance-set (instance index t) t - (unsafe)) + (always-translatable)) (defknown %layout-invalid-error (t layout) nil) - -(sb!xc:deftype raw-vector () '(simple-array sb!vm:word (*))) - -;;; %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 -(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)) -(defknown %raw-ref-double (raw-vector index) double-float - (foldable flushable)) -#!+long-float -(defknown %raw-ref-long (raw-vector index) long-float - (foldable flushable)) -(defknown %raw-set-single (raw-vector index single-float) single-float - (unsafe)) -(defknown %raw-set-double (raw-vector index double-float) double-float - (unsafe)) -#!+long-float -(defknown %raw-set-long (raw-vector index long-float) long-float - (unsafe)) - -(defknown %raw-ref-complex-single (raw-vector index) (complex single-float) - (foldable flushable)) -(defknown %raw-ref-complex-double (raw-vector index) (complex double-float) - (foldable flushable)) - -(defknown %raw-set-complex-single (raw-vector index (complex single-float)) +(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 + (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 + (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 + (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)) -(defknown %raw-set-complex-double (raw-vector index (complex double-float)) + (always-translatable)) +(defknown %raw-instance-ref/complex-double (instance index) (complex double-float) - (unsafe)) + (flushable always-translatable)) +(defknown %raw-instance-set/complex-double + (instance index (complex double-float)) + (complex double-float) + (always-translatable)) +#!+(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)) -(defknown (%set-raw-bits) (t fixnum sb!vm:word) sb!vm:word - (unsafe)) +;;; 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 + ()) (defknown allocate-vector ((unsigned-byte 8) index index) (simple-array * (*)) @@ -185,8 +199,48 @@ (defknown make-value-cell (t) t (flushable movable)) +#!+sb-simd-pack +(progn + (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) () + control-stack-pointer-sap) () system-area-pointer (flushable)) @@ -195,28 +249,24 @@ (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)) +(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)) (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 + 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) (sb!vm:word fixnum) @@ -232,26 +282,33 @@ (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)) +#!+(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)) + ()) +#!+(or x86 x86-64) +(defknown %bignum-set-with-offset + (bignum-type bignum-index (signed-byte 24) bignum-element-type) + bignum-element-type (always-translatable)) (defknown %digit-0-or-plusp (bignum-element-type) boolean (foldable flushable movable)) (defknown (%add-with-carry %subtract-with-borrow) - (bignum-element-type bignum-element-type (mod 2)) + (bignum-element-type bignum-element-type (mod 2)) (values bignum-element-type (mod 2)) (foldable flushable movable)) (defknown %multiply-and-add - (bignum-element-type bignum-element-type bignum-element-type - &optional bignum-element-type) + (bignum-element-type bignum-element-type bignum-element-type + &optional bignum-element-type) (values bignum-element-type bignum-element-type) (foldable flushable movable)) @@ -269,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)) @@ -278,31 +335,39 @@ (foldable flushable movable)) (defknown (%ashl %ashr %digit-logical-shift-right) - (bignum-element-type (mod #.sb!vm:n-word-bits)) bignum-element-type + (bignum-element-type (mod #.sb!vm:n-word-bits)) bignum-element-type (foldable flushable movable)) ;;;; bit-bashing routines -(defknown copy-to-system-area - ((simple-unboxed-array (*)) index system-area-pointer index index) - (values) - ()) - -(defknown copy-from-system-area - (system-area-pointer index (simple-unboxed-array (*)) index index) - (values) - ()) - -(defknown system-area-copy - (system-area-pointer index system-area-pointer index index) - (values) - ()) - -(defknown bit-bash-copy - ((simple-unboxed-array (*)) index - (simple-unboxed-array (*)) index index) - (values) - ()) +;;; FIXME: there's some ugly duplication between the (INTERN (FORMAT ...)) +;;; magic here and the same magic in src/code/bit-bash.lisp. I don't know +;;; of any good way to clean it up, but it's definitely violating OAOO. +(macrolet ((define-known-copiers () + `(progn + ,@(loop for i = 1 then (* i 2) + collect `(defknown ,(intern (format nil "UB~D-BASH-COPY" i) + (find-package "SB!KERNEL")) + ((simple-unboxed-array (*)) index (simple-unboxed-array (*)) index index) + (values) + ()) + collect `(defknown ,(intern (format nil "SYSTEM-AREA-UB~D-COPY" i) + (find-package "SB!KERNEL")) + (system-area-pointer index system-area-pointer index index) + (values) + ()) + collect `(defknown ,(intern (format nil "COPY-UB~D-TO-SYSTEM-AREA" i) + (find-package "SB!KERNEL")) + ((simple-unboxed-array (*)) index system-area-pointer index index) + (values) + ()) + collect `(defknown ,(intern (format nil "COPY-UB~D-FROM-SYSTEM-AREA" i) + (find-package "SB!KERNEL")) + (system-area-pointer index (simple-unboxed-array (*)) index index) + (values) + ()) + until (= i sb!vm:n-word-bits))))) + (define-known-copiers)) ;;; (not really a bit-bashing routine, but starting to take over from ;;; bit-bashing routines in byte-sized copies as of sbcl-0.6.12.29:) @@ -321,7 +386,7 @@ (defknown fun-subtype (function) (unsigned-byte #.sb!vm:n-widetag-bits) (flushable)) (defknown ((setf fun-subtype)) - ((unsigned-byte #.sb!vm:n-widetag-bits) function) + ((unsigned-byte #.sb!vm:n-widetag-bits) function) (unsigned-byte #.sb!vm:n-widetag-bits) ()) @@ -329,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)) @@ -343,11 +408,11 @@ (defknown %closure-index-ref (function index) t (flushable)) -(defknown %make-funcallable-instance (index layout) function - (unsafe)) +(defknown %make-funcallable-instance (index) function + ()) (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 @@ -355,4 +420,4 @@ (defknown %data-vector-and-index (array index) (values (simple-array * (*)) index) - (foldable flushable)) + (foldable flushable))