X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Froom.lisp;h=0faffaed3d2fc71ab31f7bcd2d1a81e24be713ba;hb=20c130301e5f3c7da8325dfe7788aa820ef2a86c;hp=4dbefe7f41dd2eb4107f99f6dbc465325296ef7d;hpb=2d3cb6dba6461e98744eca2a1df4f770cea468ca;p=sbcl.git

diff --git a/src/code/room.lisp b/src/code/room.lisp
index 4dbefe7..0faffae 100644
--- a/src/code/room.lisp
+++ b/src/code/room.lisp
@@ -50,9 +50,9 @@
 			    :kind :fixed
 			    :length size))))))
 
-(dolist (code (list complex-string-widetag simple-array-widetag
+(dolist (code (list complex-base-string-widetag simple-array-widetag
 		    complex-bit-vector-widetag complex-vector-widetag
-		    complex-array-widetag))
+		    complex-array-widetag complex-vector-nil-widetag))
   (setf (svref *meta-room-info* code)
 	(make-room-info :name 'array-header
 			:kind :header)))
@@ -69,11 +69,15 @@
 		 (simple-vector-widetag . 2)
 		 (simple-array-unsigned-byte-2-widetag . -2)
 		 (simple-array-unsigned-byte-4-widetag . -1)
+		 (simple-array-unsigned-byte-7-widetag . 0)
 		 (simple-array-unsigned-byte-8-widetag . 0)
+		 (simple-array-unsigned-byte-15-widetag . 1)
 		 (simple-array-unsigned-byte-16-widetag . 1)
+		 (simple-array-unsigned-byte-31-widetag . 2)
 		 (simple-array-unsigned-byte-32-widetag . 2)
 		 (simple-array-signed-byte-8-widetag . 0)
 		 (simple-array-signed-byte-16-widetag . 1)
+		 (simple-array-unsigned-byte-29-widetag . 2)
 		 (simple-array-signed-byte-30-widetag . 2)
 		 (simple-array-signed-byte-32-widetag . 2)
 		 (simple-array-single-float-widetag . 2)
@@ -91,8 +95,8 @@
 			  :kind :vector
 			  :length size))))
 
-(setf (svref *meta-room-info* simple-string-widetag)
-      (make-room-info :name 'simple-string
+(setf (svref *meta-room-info* simple-base-string-widetag)
+      (make-room-info :name 'simple-base-string
 		      :kind :string
 		      :length 0))
 
@@ -132,7 +136,8 @@
      (values (int-sap read-only-space-start)
 	     (int-sap (* *read-only-space-free-pointer* n-word-bytes))))
     (:dynamic
-     (values (int-sap dynamic-space-start)
+     (values (int-sap #!+gencgc dynamic-space-start 
+		      #!-gencgc (current-dynamic-space-start))
 	     (dynamic-space-free-pointer)))))
 
 ;;; Return the total number of bytes used in SPACE.
@@ -439,7 +444,8 @@
 	   ((#.bignum-widetag
 	     #.single-float-widetag
 	     #.double-float-widetag
-	     #.simple-string-widetag
+	     #.simple-base-string-widetag
+	     #.simple-array-nil-widetag
 	     #.simple-bit-vector-widetag
 	     #.simple-array-unsigned-byte-2-widetag
 	     #.simple-array-unsigned-byte-4-widetag
@@ -462,7 +468,8 @@
 	     #.complex-widetag
 	     #.simple-array-widetag
 	     #.simple-vector-widetag
-	     #.complex-string-widetag
+	     #.complex-base-string-widetag
+	     #.complex-vector-nil-widetag
 	     #.complex-bit-vector-widetag
 	     #.complex-vector-widetag
 	     #.complex-array-widetag