0.9.18.12: valid/already-dumped confusion in the file compiler/

[sbcl.git] / src / compiler / generic / vm-fndb.lisp

diff --git a/src/compiler/generic/vm-fndb.lisp b/src/compiler/generic/vm-fndb.lisp
index 93c5677..a4622b1 100644 (file)
--- a/src/compiler/generic/vm-fndb.lisp
+++ b/src/compiler/generic/vm-fndb.lisp
@@ -116,44 +116,53 @@
 (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))
+  (unsafe always-translatable))
 (defknown %layout-invalid-error (t layout) nil)
 
+#!-hppa
+(progn
 (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))
+  (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))
+  (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))
+  (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))
+  (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 (*)))
+  (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
@@ -161,32 +170,32 @@
                                   sb!vm::simple-array-unsigned-byte-64)
 
 (defknown %raw-ref-single (raw-vector index) single-float
-  (foldable flushable))
+  (foldable flushable always-translatable))
 (defknown %raw-ref-double (raw-vector index) double-float
-  (foldable flushable))
+  (foldable flushable always-translatable))
 #!+long-float
 (defknown %raw-ref-long (raw-vector index) long-float
-  (foldable flushable))
+  (foldable flushable always-translatable))
 (defknown %raw-set-single (raw-vector index single-float) single-float
-  (unsafe))
+  (unsafe always-translatable))
 (defknown %raw-set-double (raw-vector index double-float) double-float
-  (unsafe))
+  (unsafe always-translatable))
 #!+long-float
 (defknown %raw-set-long (raw-vector index long-float) long-float
-  (unsafe))
+  (unsafe always-translatable))
 
 (defknown %raw-ref-complex-single (raw-vector index) (complex single-float)
-  (foldable flushable))
+  (foldable flushable always-translatable))
 (defknown %raw-ref-complex-double (raw-vector index) (complex double-float)
-  (foldable flushable))
+  (foldable flushable always-translatable))
 
 (defknown %raw-set-complex-single (raw-vector index (complex single-float))
   (complex single-float)
-  (unsafe))
+  (unsafe always-translatable))
 (defknown %raw-set-complex-double (raw-vector index (complex double-float))
   (complex double-float)
-  (unsafe))
-
+  (unsafe always-translatable))
+)
 
 (defknown %raw-bits (t fixnum) sb!vm:word
   (foldable flushable))
@@ -216,6 +225,13 @@
 (defknown make-value-cell (t) t
   (flushable movable))
 
+;;;; threading
+
+#!+(and sb-lutex sb-thread)
+(progn
+  (defknown sb!vm::%make-lutex () sb!vm::lutex ())
+  (defknown sb!vm::lutexp (t) boolean (foldable flushable)))
+
 (defknown (dynamic-space-free-pointer binding-stack-pointer-sap
                                       control-stack-pointer-sap)  ()
   system-area-pointer
@@ -382,7 +398,7 @@
 (defknown %closure-index-ref (function index) t
   (flushable))
 
-(defknown %make-funcallable-instance (index layout) function
+(defknown %make-funcallable-instance (index) function
   (unsafe))
 
 (defknown %funcallable-instance-info (function index) t (flushable))