Changeset 12886


Ignore:
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:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/purify/source/lisp-kernel/image.c

    r12811 r12886  
    227227  case AREA_MANAGED_STATIC:
    228228    a = new_area(pure_space_limit, pure_space_limit, AREA_MANAGED_STATIC);
     229    sect->area = a;
     230    break;
     231
     232  case AREA_STATIC_CONS:
     233    a = new_area(pure_space_limit, pure_space_limit, AREA_STATIC_CONS);
    229234    sect->area = a;
    230235    break;
     
    309314        add_area_holding_area_lock(a);
    310315        break;
     316      case AREA_STATIC_CONS:
     317        if (bias) {
     318          relocate_area_contents(a, bias);
     319        }
     320        static_cons_area = a;
     321        add_area_holding_area_lock(a);
     322        break;
    311323      case AREA_DYNAMIC:
    312324        if (bias) {
     
    417429  areas[2] = readonly_area;
    418430  areas[3] = managed_static_area;
     431  areas[4] = static_cons_area;
    419432  for (i = 0; i < NUM_IMAGE_SECTIONS; i++) {
    420433    a = areas[i];
  • branches/purify/source/lisp-kernel/image.h

    r12679 r12886  
    9090
    9191
    92 #define ABI_VERSION_MIN 1033
    93 #define ABI_VERSION_CURRENT 1033
    94 #define ABI_VERSION_MAX 1033
     92#define ABI_VERSION_MIN 1036
     93#define ABI_VERSION_CURRENT 1036
     94#define ABI_VERSION_MAX 1036
    9595
    96 #define NUM_IMAGE_SECTIONS 4    /* used to be 3 */
     96#define NUM_IMAGE_SECTIONS 5    /* used to be 3 */
  • branches/purify/source/lisp-kernel/kernel-globals.h

    r4392 r12886  
    2020
    2121
    22 extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area;
     22extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area, *static_cons_area;
    2323extern area *all_areas;
    2424extern int cache_block_size;
  • branches/purify/source/lisp-kernel/pmcl-kernel.c

    r12672 r12886  
    416416  *g1_area=NULL,
    417417  *managed_static_area=NULL,
     418  *static_cons_area=NULL,
    418419  *readonly_area=NULL;
    419420
  • branches/purify/source/xdump/heap-image.lisp

    r12679 r12886  
    9797
    9898
    99 (defparameter *image-abi-version* 1033)
     99(defparameter *image-abi-version* 1036)
    100100
    101101(defun write-image-file (pathname image-base spaces &optional (abi-version *image-abi-version*))
  • branches/purify/source/xdump/xfasload.lisp

    r12210 r12886  
    8181(defparameter *xload-managed-static-space-address* nil)
    8282(defparameter *xload-managed-static-space-size* 0)
     83(defparameter *xload-static-cons-space-address* nil)
     84(defparameter *xload-static-cons-space-size* 0)
    8385
    8486(defstruct backend-xload-info
     
    110112          (+ *xload-image-base-address*
    111113             *xload-purespace-reserve*))
    112     (setq *xload-managed-static-space-address* *xload-dynamic-space-address*)
     114    (setq *xload-managed-static-space-address* *xload-dynamic-space-address*
     115          *xload-static-cons-space-address* *xload-dynamic-space-address*)
    113116    (setq *xload-static-space-address*
    114117          (backend-xload-info-static-space-address
     
    344347(defparameter *xload-static-space* nil)
    345348(defparameter *xload-managed-static-space* nil)
     349(defparameter *xload-static-cons-space* nil)
    346350(defparameter *xload-symbols* nil)
    347351(defparameter *xload-symbol-addresses* nil)
     
    10281032         (*xload-static-space* (init-xload-space *xload-static-space-address* *xload-static-space-size* area-static))
    10291033         (*xload-managed-static-space* (init-xload-space *xload-managed-static-space-address* *xload-managed-static-space-size* area-managed-static))
     1034         (*xload-static-cons-space* (init-xload-space *xload-static-cons-space-address* *xload-static-cons-space-size* area-static-cons))
    10301035                                                 
    10311036         (*xload-package-alist* (xload-clone-packages (xload-initial-packages)))
     
    11391144                          *xload-static-space*
    11401145                          *xload-dynamic-space*
    1141                           *xload-managed-static-space*)))
     1146                          *xload-managed-static-space*
     1147                          *xload-static-cons-space*)))
    11421148                   
    11431149
Note: See TracChangeset for help on using the changeset viewer.