X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Froom.lisp;h=1116735d73de67458ad2db4267d43c28b3a28af8;hb=5bc505c743d3f89de71b319479c2bbb71b0256ae;hp=3ba28fd12cd7848ef3d01dcde787feda583e4cbf;hpb=64fb1f750762dad66255d941292283b92ce9a078;p=sbcl.git

diff --git a/src/code/room.lisp b/src/code/room.lisp
index 3ba28fd..1116735 100644
--- a/src/code/room.lisp
+++ b/src/code/room.lisp
@@ -72,7 +72,8 @@
 			    :kind :fixed
 			    :length size))))))
 
-(dolist (code (list complex-base-string-widetag simple-array-widetag
+(dolist (code (list #!+sb-unicode complex-character-string-widetag
+                    complex-base-string-widetag simple-array-widetag
 		    complex-bit-vector-widetag complex-vector-widetag
 		    complex-array-widetag complex-vector-nil-widetag))
   (setf (svref *meta-room-info* code)
@@ -97,11 +98,16 @@
 		 (simple-array-unsigned-byte-16-widetag . 1)
 		 (simple-array-unsigned-byte-31-widetag . 2)
 		 (simple-array-unsigned-byte-32-widetag . 2)
+		 (simple-array-unsigned-byte-60-widetag . 3)
+		 (simple-array-unsigned-byte-63-widetag . 3)
+		 (simple-array-unsigned-byte-64-widetag . 3)
 		 (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-signed-byte-61-widetag . 3)
+		 (simple-array-signed-byte-64-widetag . 3)
 		 (simple-array-single-float-widetag . 2)
 		 (simple-array-double-float-widetag . 3)
 		 (simple-array-complex-single-float-widetag . 3)
@@ -109,19 +115,26 @@
   (let* ((name (car stuff))
 	 (size (cdr stuff))
 	 (sname (string name)))
-    (setf (svref *meta-room-info* (symbol-value name))
-	  (make-room-info :name (intern (subseq sname
-						0
-						(mismatch sname "-WIDETAG"
-							  :from-end t)))
-			  :kind :vector
-			  :length size))))
+    (when (boundp name)
+      (setf (svref *meta-room-info* (symbol-value name))
+	    (make-room-info :name (intern (subseq sname
+						  0
+						  (mismatch sname "-WIDETAG"
+							    :from-end t)))
+			    :kind :vector
+			    :length size)))))
 
 (setf (svref *meta-room-info* simple-base-string-widetag)
       (make-room-info :name 'simple-base-string
 		      :kind :string
 		      :length 0))
 
+#!+sb-unicode
+(setf (svref *meta-room-info* simple-character-string-widetag)
+      (make-room-info :name 'simple-character-string
+		      :kind :string
+		      :length 2))
+
 (setf (svref *meta-room-info* simple-array-nil-widetag)
       (make-room-info :name 'simple-array-nil
 		      :kind :fixed
@@ -158,8 +171,7 @@
      (values (int-sap read-only-space-start)
 	     (int-sap (* *read-only-space-free-pointer* n-word-bytes))))
     (:dynamic
-     (values (int-sap #!+gencgc dynamic-space-start 
-		      #!-gencgc (current-dynamic-space-start))
+     (values (int-sap (current-dynamic-space-start))
 	     (dynamic-space-free-pointer)))))
 
 ;;; Return the total number of bytes used in SPACE.
@@ -206,7 +218,7 @@
 	    #+nil
 	    (prev nil))
 	(loop
-	  (let* ((header (sap-ref-32 current 0))
+	  (let* ((header (sap-ref-word current 0))
 		 (header-widetag (logand header #xFF))
 		 (info (svref *room-info* header-widetag)))
 	    (cond
@@ -434,7 +446,7 @@
 			       (%primitive code-instructions obj))))
 	   (incf code-words words)
 	   (dotimes (i words)
-	     (when (zerop (sap-ref-32 sap (* i n-word-bytes)))
+	     (when (zerop (sap-ref-word sap (* i n-word-bytes)))
 	       (incf no-ops))))))
      space)
 
@@ -467,6 +479,7 @@
 	     #.single-float-widetag
 	     #.double-float-widetag
 	     #.simple-base-string-widetag
+             #!+sb-unicode #.simple-character-string-widetag
 	     #.simple-array-nil-widetag
 	     #.simple-bit-vector-widetag
 	     #.simple-array-unsigned-byte-2-widetag
@@ -476,7 +489,7 @@
 	     #.simple-array-unsigned-byte-32-widetag
 	     #.simple-array-signed-byte-8-widetag
 	     #.simple-array-signed-byte-16-widetag
-	     #.simple-array-signed-byte-30-widetag
+	     ; #.simple-array-signed-byte-30-widetag
 	     #.simple-array-signed-byte-32-widetag
 	     #.simple-array-single-float-widetag
 	     #.simple-array-double-float-widetag
@@ -513,7 +526,7 @@
     (values)))
 
 ;;; Print a breakdown by instance type of all the instances allocated
-;;; in SPACE. If TOP-N is true, print only information for the the
+;;; in SPACE. If TOP-N is true, print only information for the 
 ;;; TOP-N types with largest usage.
 (defun instance-usage (space &key (top-n 15))
   (declare (type spaces space) (type (or fixnum null) top-n))