X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=3712e4cd2bae5c9bb99db3cd8f9d73cda40a1b3a;hb=70f323d9b06b95ed37a447742c1925906985c088;hp=93c56774d6bf7bd823f4d061bb1a85902dd01cc3;hpb=f1ffbf976aaa50b7b22f126b97e34afe06a91210;p=sbcl.git

diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp
index 93c5677..3712e4c 100644
--- a/src/compiler/generic/vm-fndb.lisp
+++ b/src/compiler/generic/vm-fndb.lisp
@@ -20,33 +20,32 @@
            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-char-p %standard-char-p %instancep %other-pointer-p
            base-string-p simple-base-string-p
            #!+sb-unicode character-string-p
            #!+sb-unicode simple-character-string-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
-           #!+#.(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
@@ -62,30 +61,44 @@
            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"
 
+(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 +111,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,95 +121,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)
 
 (defknown %raw-instance-ref/word (instance index) sb!vm:word
-  (flushable))
+  (flushable always-translatable))
 (defknown %raw-instance-set/word (instance index sb!vm:word) sb!vm:word
-  (unsafe))
+  (always-translatable))
 (defknown %raw-instance-ref/single (instance index) single-float
-  (flushable))
+  (flushable always-translatable))
 (defknown %raw-instance-set/single (instance index single-float) single-float
-  (unsafe))
+  (always-translatable))
 (defknown %raw-instance-ref/double (instance index) double-float
-  (flushable))
+  (flushable always-translatable))
 (defknown %raw-instance-set/double (instance index double-float) double-float
-  (unsafe))
+  (always-translatable))
 (defknown %raw-instance-ref/complex-single (instance index)
   (complex single-float)
-  (flushable))
+  (flushable always-translatable))
 (defknown %raw-instance-set/complex-single
     (instance index (complex single-float))
   (complex single-float)
-  (unsafe))
+  (always-translatable))
 (defknown %raw-instance-ref/complex-double (instance index)
   (complex double-float)
-  (flushable))
+  (flushable always-translatable))
 (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 (*)))
-
-;;; %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))
-  (complex single-float)
-  (unsafe))
-(defknown %raw-set-complex-double (raw-vector index (complex double-float))
-  (complex double-float)
-  (unsafe))
+  (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.
+;;; These two are mostly used for bit-bashing operations.
 (defknown %vector-raw-bits (t fixnum) sb!vm:word
-  (foldable flushable))
+  (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 * (*))
@@ -216,6 +194,8 @@
 (defknown make-value-cell (t) t
   (flushable movable))
 
+;;;; threading
+
 (defknown (dynamic-space-free-pointer binding-stack-pointer-sap
                                       control-stack-pointer-sap)  ()
   system-area-pointer
@@ -226,19 +206,15 @@
 (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))
 
@@ -263,14 +239,21 @@
   (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))
@@ -300,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))
 
@@ -368,13 +351,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))
@@ -382,11 +365,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