Changeset 12886

Timestamp:

Sep 27, 2009, 4:08:39 AM (10 years ago)

Author:

gb

Message:

Write a (possibly empty) static-cons-area to image file;
read it. Change image version.

Location:

branches/purify/source

Files:

• lisp-kernel/image.c (modified) (3 diffs)
• lisp-kernel/image.h (modified) (1 diff)
• lisp-kernel/kernel-globals.h (modified) (1 diff)
• lisp-kernel/pmcl-kernel.c (modified) (1 diff)
• xdump/heap-image.lisp (modified) (1 diff)
• xdump/xfasload.lisp (modified) (5 diffs)

branches/purify/source/lisp-kernel/image.c

@@ -227 +227 @@
   case AREA_MANAGED_STATIC:
     a = new_area(pure_space_limit, pure_space_limit, AREA_MANAGED_STATIC);
+    sect->area = a;
+    break;
+
+  case AREA_STATIC_CONS:
+    a = new_area(pure_space_limit, pure_space_limit, AREA_STATIC_CONS);
     sect->area = a;
     break;
@@ -309 +314 @@
         add_area_holding_area_lock(a);
         break;
+      case AREA_STATIC_CONS:
+        if (bias) {
+          relocate_area_contents(a, bias);
+        }
+        static_cons_area = a;
+        add_area_holding_area_lock(a);
+        break;
       case AREA_DYNAMIC:
         if (bias) {
@@ -417 +429 @@
   areas[2] = readonly_area;
   areas[3] = managed_static_area;
+  areas[4] = static_cons_area;
   for (i = 0; i < NUM_IMAGE_SECTIONS; i++) {
     a = areas[i];

branches/purify/source/lisp-kernel/image.h

@@ -90 +90 @@
 
 
-#define ABI_VERSION_MIN 1033
-#define ABI_VERSION_CURRENT 1033
-#define ABI_VERSION_MAX 1033
+#define ABI_VERSION_MIN 1036
+#define ABI_VERSION_CURRENT 1036
+#define ABI_VERSION_MAX 1036
 
-#define NUM_IMAGE_SECTIONS 4    /* used to be 3 */
+#define NUM_IMAGE_SECTIONS 5    /* used to be 3 */

branches/purify/source/lisp-kernel/kernel-globals.h

@@ -20 +20 @@
 
 
-extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area;
+extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area, *static_cons_area;
 extern area *all_areas;
 extern int cache_block_size;

branches/purify/source/lisp-kernel/pmcl-kernel.c

@@ -416 +416 @@
   *g1_area=NULL,
   *managed_static_area=NULL,
+  *static_cons_area=NULL,
   *readonly_area=NULL;
 

branches/purify/source/xdump/heap-image.lisp

@@ -97 +97 @@
 
 
-(defparameter *image-abi-version* 1033)
+(defparameter *image-abi-version* 1036)
 
 (defun write-image-file (pathname image-base spaces &optional (abi-version *image-abi-version*))

branches/purify/source/xdump/xfasload.lisp

@@ -81 +81 @@
 (defparameter *xload-managed-static-space-address* nil)
 (defparameter *xload-managed-static-space-size* 0)
+(defparameter *xload-static-cons-space-address* nil)
+(defparameter *xload-static-cons-space-size* 0)
 
 (defstruct backend-xload-info
@@ -110 +112 @@
           (+ *xload-image-base-address*
              *xload-purespace-reserve*))
-    (setq *xload-managed-static-space-address* *xload-dynamic-space-address*)
+    (setq *xload-managed-static-space-address* *xload-dynamic-space-address*
+          *xload-static-cons-space-address* *xload-dynamic-space-address*)
     (setq *xload-static-space-address*
           (backend-xload-info-static-space-address
@@ -344 +347 @@
 (defparameter *xload-static-space* nil)
 (defparameter *xload-managed-static-space* nil)
+(defparameter *xload-static-cons-space* nil)
 (defparameter *xload-symbols* nil)
 (defparameter *xload-symbol-addresses* nil)
@@ -1028 +1032 @@
          (*xload-static-space* (init-xload-space *xload-static-space-address* *xload-static-space-size* area-static))
          (*xload-managed-static-space* (init-xload-space *xload-managed-static-space-address* *xload-managed-static-space-size* area-managed-static))
+         (*xload-static-cons-space* (init-xload-space *xload-static-cons-space-address* *xload-static-cons-space-size* area-static-cons))
                                                  
          (*xload-package-alist* (xload-clone-packages (xload-initial-packages)))
@@ -1139 +1144 @@
                           *xload-static-space*
                           *xload-dynamic-space*
-                          *xload-managed-static-space*)))
+                          *xload-managed-static-space*
+                          *xload-static-cons-space*)))