X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=93c56774d6bf7bd823f4d061bb1a85902dd01cc3;hb=40e3ba03d0e1b824e4d1ae75d74246b975b70964;hp=98bebdc74b71a026cbc4b279049f6f5c5b1977dd;hpb=338732358d49ab202fe55c3581294597d63aec6b;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 98bebdc..93c5677 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -16,44 +16,44 @@ ;;; 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 + 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 + 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 + 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-30-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,8 +62,8 @@ 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) + vector-t-p weak-pointer-p code-component-p lra-p + funcallable-instance-p) (t) boolean (movable foldable flushable)) ;;;; miscellaneous "sub-primitives" @@ -121,6 +121,32 @@ (unsafe)) (defknown %layout-invalid-error (t layout) nil) +(defknown %raw-instance-ref/word (instance index) sb!vm:word + (flushable)) +(defknown %raw-instance-set/word (instance index sb!vm:word) sb!vm:word + (unsafe)) +(defknown %raw-instance-ref/single (instance index) single-float + (flushable)) +(defknown %raw-instance-set/single (instance index single-float) single-float + (unsafe)) +(defknown %raw-instance-ref/double (instance index) double-float + (flushable)) +(defknown %raw-instance-set/double (instance index double-float) double-float + (unsafe)) +(defknown %raw-instance-ref/complex-single (instance index) + (complex single-float) + (flushable)) +(defknown %raw-instance-set/complex-single + (instance index (complex single-float)) + (complex single-float) + (unsafe)) +(defknown %raw-instance-ref/complex-double (instance index) + (complex double-float) + (flushable)) +(defknown %raw-instance-set/complex-double + (instance index (complex double-float)) + (complex double-float) + (unsafe)) (sb!xc:deftype raw-vector () '(simple-array sb!vm:word (*))) @@ -191,7 +217,7 @@ (flushable movable)) (defknown (dynamic-space-free-pointer binding-stack-pointer-sap - control-stack-pointer-sap) () + control-stack-pointer-sap) () system-area-pointer (flushable)) @@ -217,11 +243,11 @@ (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) @@ -250,13 +276,13 @@ (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)) @@ -283,7 +309,7 @@ (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 @@ -294,22 +320,22 @@ (macrolet ((define-known-copiers () `(progn ,@(loop for i = 1 then (* i 2) - collect `(defknown ,(intern (format nil "UB~A-BASH-COPY" i) + 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~A-COPY" i) + 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~A-TO-SYSTEM-AREA" i) + 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~A-FROM-SYSTEM-AREA" i) + 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) @@ -334,7 +360,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) ()) @@ -368,4 +394,4 @@ (defknown %data-vector-and-index (array index) (values (simple-array * (*)) index) - (foldable flushable)) + (foldable flushable))