Changeset 12886
- Timestamp:
- Sep 27, 2009, 4:08:39 AM (10 years ago)
- Location:
- branches/purify/source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/purify/source/lisp-kernel/image.c
r12811 r12886 227 227 case AREA_MANAGED_STATIC: 228 228 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); 229 234 sect->area = a; 230 235 break; … … 309 314 add_area_holding_area_lock(a); 310 315 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; 311 323 case AREA_DYNAMIC: 312 324 if (bias) { … … 417 429 areas[2] = readonly_area; 418 430 areas[3] = managed_static_area; 431 areas[4] = static_cons_area; 419 432 for (i = 0; i < NUM_IMAGE_SECTIONS; i++) { 420 433 a = areas[i]; -
branches/purify/source/lisp-kernel/image.h
r12679 r12886 90 90 91 91 92 #define ABI_VERSION_MIN 103 393 #define ABI_VERSION_CURRENT 103 394 #define ABI_VERSION_MAX 103 392 #define ABI_VERSION_MIN 1036 93 #define ABI_VERSION_CURRENT 1036 94 #define ABI_VERSION_MAX 1036 95 95 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 20 20 21 21 22 extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area ;22 extern area *nilreg_area, *tenured_area, *g2_area, *g1_area, *managed_static_area, *readonly_area, *static_cons_area; 23 23 extern area *all_areas; 24 24 extern int cache_block_size; -
branches/purify/source/lisp-kernel/pmcl-kernel.c
r12672 r12886 416 416 *g1_area=NULL, 417 417 *managed_static_area=NULL, 418 *static_cons_area=NULL, 418 419 *readonly_area=NULL; 419 420 -
branches/purify/source/xdump/heap-image.lisp
r12679 r12886 97 97 98 98 99 (defparameter *image-abi-version* 103 3)99 (defparameter *image-abi-version* 1036) 100 100 101 101 (defun write-image-file (pathname image-base spaces &optional (abi-version *image-abi-version*)) -
branches/purify/source/xdump/xfasload.lisp
r12210 r12886 81 81 (defparameter *xload-managed-static-space-address* nil) 82 82 (defparameter *xload-managed-static-space-size* 0) 83 (defparameter *xload-static-cons-space-address* nil) 84 (defparameter *xload-static-cons-space-size* 0) 83 85 84 86 (defstruct backend-xload-info … … 110 112 (+ *xload-image-base-address* 111 113 *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*) 113 116 (setq *xload-static-space-address* 114 117 (backend-xload-info-static-space-address … … 344 347 (defparameter *xload-static-space* nil) 345 348 (defparameter *xload-managed-static-space* nil) 349 (defparameter *xload-static-cons-space* nil) 346 350 (defparameter *xload-symbols* nil) 347 351 (defparameter *xload-symbol-addresses* nil) … … 1028 1032 (*xload-static-space* (init-xload-space *xload-static-space-address* *xload-static-space-size* area-static)) 1029 1033 (*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)) 1030 1035 1031 1036 (*xload-package-alist* (xload-clone-packages (xload-initial-packages))) … … 1139 1144 *xload-static-space* 1140 1145 *xload-dynamic-space* 1141 *xload-managed-static-space*))) 1146 *xload-managed-static-space* 1147 *xload-static-cons-space*))) 1142 1148 1143 1149
Note: See TracChangeset
for help on using the changeset viewer.