X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=98bebdc74b71a026cbc4b279049f6f5c5b1977dd;hb=338732358d49ab202fe55c3581294597d63aec6b;hp=8221f5b26bd6057faff6be658a7b9fb2e6374dbe;hpb=f143939b1dbaf38ebd4f92c851fbc4ecddf37af1;p=sbcl.git diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp index 8221f5b..98bebdc 100644 --- a/src/compiler/generic/vm-fndb.lisp +++ b/src/compiler/generic/vm-fndb.lisp @@ -21,18 +21,47 @@ 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-unsigned-byte-2-p - simple-array-unsigned-byte-4-p simple-array-unsigned-byte-8-p - simple-array-unsigned-byte-16-p simple-array-unsigned-byte-32-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 + #!+#.(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-30-p simple-array-signed-byte-32-p + #!+#.(cl:if (cl:= 32 sb!vm:n-word-bits) '(and) '(or)) + 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 unsigned-byte-32-p signed-byte-32-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)) + signed-byte-32-p + #!+#.(cl:if (cl:= 64 sb!vm:n-word-bits) '(and) '(or)) + 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) (t) boolean (movable foldable flushable)) @@ -50,14 +79,20 @@ (defknown %sxhash-simple-substring (simple-string index) index (foldable flushable)) +(defknown symbol-hash (symbol) (integer 0 #.sb!xc:most-positive-fixnum) + (flushable movable)) + +(defknown %set-symbol-hash (symbol (integer 0 #.sb!xc:most-positive-fixnum)) + t (unsafe)) + (defknown vector-length (vector) index (flushable)) (defknown vector-sap ((simple-unboxed-array (*))) system-area-pointer (flushable)) -(defknown get-lowtag (t) (unsigned-byte #.sb!vm:lowtag-bits) +(defknown lowtag-of (t) (unsigned-byte #.sb!vm:n-lowtag-bits) (flushable movable)) -(defknown get-type (t) (unsigned-byte #.sb!vm:type-bits) +(defknown widetag-of (t) (unsigned-byte #.sb!vm:n-widetag-bits) (flushable movable)) (defknown (get-header-data get-closure-length) (t) (unsigned-byte 24) @@ -65,6 +100,12 @@ (defknown set-header-data (t (unsigned-byte 24)) t (unsafe)) +(defknown %array-dimension (t index) index + (flushable)) +(defknown %set-array-dimension (t index index) index + ()) +(defknown %array-rank (t) index + (flushable)) (defknown %make-instance (index) instance (unsafe)) @@ -81,7 +122,17 @@ (defknown %layout-invalid-error (t layout) nil) -(sb!xc:deftype raw-vector () '(simple-array (unsigned-byte 32) (*))) +(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)) @@ -102,23 +153,23 @@ (foldable flushable)) (defknown %raw-ref-complex-double (raw-vector index) (complex double-float) (foldable flushable)) -#!+long-float -(defknown %raw-ref-complex-long (raw-vector index) (complex long-float) - (foldable flushable)) + (defknown %raw-set-complex-single (raw-vector index (complex single-float)) (complex single-float) (unsafe)) (defknown %raw-set-complex-double (raw-vector index (complex double-float)) (complex double-float) (unsafe)) -#!+long-float -(defknown %raw-set-complex-long (raw-vector index (complex long-float)) - (complex long-float) - (unsafe)) -(defknown %raw-bits (t fixnum) (unsigned-byte 32) + +(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 (foldable flushable)) -(defknown (%set-raw-bits) (t fixnum (unsigned-byte 32)) (unsigned-byte 32) +(defknown (%set-vector-raw-bits) (t fixnum sb!vm:word) sb!vm:word (unsafe)) @@ -152,29 +203,29 @@ (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 ((unsigned-byte 32)) t (movable flushable)) -(defknown get-lisp-obj-address (t) (unsigned-byte 32) (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) (unsigned-byte 32) (unsigned-byte 32)) - (unsigned-byte 32) +(defknown merge-bits ((unsigned-byte 5) sb!vm:word sb!vm:word) + sb!vm:word (foldable flushable movable)) -(defknown 32bit-logical-not ((unsigned-byte 32)) (unsigned-byte 32) +(defknown word-logical-not (sb!vm:word) sb!vm:word (foldable flushable movable)) -(defknown (32bit-logical-and 32bit-logical-nand - 32bit-logical-or 32bit-logical-nor - 32bit-logical-xor 32bit-logical-eqv - 32bit-logical-andc1 32bit-logical-andc2 - 32bit-logical-orc1 32bit-logical-orc2) - ((unsigned-byte 32) (unsigned-byte 32)) (unsigned-byte 32) +(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 (foldable flushable movable)) -(defknown (shift-towards-start shift-towards-end) ((unsigned-byte 32) fixnum) - (unsigned-byte 32) +(defknown (shift-towards-start shift-towards-end) (sb!vm:word fixnum) + sb!vm:word (foldable flushable movable)) ;;;; bignum operations @@ -228,42 +279,50 @@ (foldable flushable movable)) (defknown %fixnum-digit-with-correct-sign (bignum-element-type) - (signed-byte #.sb!vm:word-bits) + (signed-byte #.sb!vm:n-word-bits) (foldable flushable movable)) (defknown (%ashl %ashr %digit-logical-shift-right) - (bignum-element-type (mod 32)) 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) - null - ()) - -(defknown copy-from-system-area - (system-area-pointer index (simple-unboxed-array (*)) index index) - null - ()) - -(defknown system-area-copy - (system-area-pointer index system-area-pointer index index) - null - ()) - -(defknown bit-bash-copy - ((simple-unboxed-array (*)) index - (simple-unboxed-array (*)) index index) - null - ()) +;;; 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~A-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) + (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) + (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) + (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:) (defknown %byte-blt ((or (simple-unboxed-array (*)) system-area-pointer) index (or (simple-unboxed-array (*)) system-area-pointer) index index) - null + (values) ()) ;;;; code/function/fdefn object manipulation routines @@ -272,11 +331,11 @@ (defknown code-header-ref (t index) t (flushable)) (defknown code-header-set (t index t) t ()) -(defknown function-subtype (function) (unsigned-byte #.sb!vm:type-bits) +(defknown fun-subtype (function) (unsigned-byte #.sb!vm:n-widetag-bits) (flushable)) -(defknown ((setf function-subtype)) - ((unsigned-byte #.sb!vm:type-bits) function) - (unsigned-byte #.sb!vm:type-bits) +(defknown ((setf fun-subtype)) + ((unsigned-byte #.sb!vm:n-widetag-bits) function) + (unsigned-byte #.sb!vm:n-widetag-bits) ()) (defknown make-fdefn (t) fdefn (flushable movable)) @@ -306,3 +365,7 @@ ;;;; mutator accessors (defknown mutator-self () system-area-pointer (flushable movable)) + +(defknown %data-vector-and-index (array index) + (values (simple-array * (*)) index) + (foldable flushable))