[Sbcl-commits] CVS: sbcl/src/compiler/generic vm-fndb.lisp,1.24,1.25

[Nathan F. <nf...@us...>]

Update of /cvsroot/sbcl/sbcl/src/compiler/generic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31716/src/compiler/generic

Modified Files:
	vm-fndb.lisp 
Log Message:
0.8.13.54:
	Define an appropriate primitive type alias for SB!C::RAW-VECTOR;
	  the src/compiler/*/array.lisp changes from a version or two
	  ago should now build properly (thanks to Xophe for the alias
	  idea).

	Merge changes to package-data-list.lisp-expr, including support
	  for various 32/64-bit-isms which have not yet landed.


Index: vm-fndb.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/compiler/generic/vm-fndb.lisp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- vm-fndb.lisp	10 Aug 2004 00:20:45 -0000	1.24
+++ vm-fndb.lisp	10 Aug 2004 15:38:13 -0000	1.25
@@ -51,7 +51,15 @@
 	   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))
@@ -114,6 +122,16 @@
 
 (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
@@ -258,7 +276,7 @@
   (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