X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler%2Fgeneric%2Fvm-fndb.lisp;h=6cc63537cb557e5313fcd9cb4159b59a168a703a;hb=3b7fca49cbf6c48605e7ebc1f57caa3255ca5cfd;hp=7a497fde8c967b21d57c8911c3d3c7a28a9aaaa0;hpb=65cccbb44b03207ce2fb73b29424a91a7d315189;p=sbcl.git

diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp
index 7a497fd..6cc6353 100644
--- a/src/compiler/generic/vm-fndb.lisp
+++ b/src/compiler/generic/vm-fndb.lisp
@@ -69,21 +69,23 @@
 
 ;;;; 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))
+(defknown %set-symbol-hash (symbol hash)
   t (unsafe))
 
 (defknown vector-length (vector) index (flushable))
@@ -109,7 +111,9 @@
   (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
@@ -122,8 +126,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
@@ -150,53 +152,15 @@
     (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)
-  (unsafe always-translatable))
-)
 
 (defknown %raw-bits (t fixnum) sb!vm:word
   (foldable flushable))
@@ -258,10 +222,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))