Changeset 12679

Timestamp:

Aug 25, 2009, 11:29:57 AM (15 years ago)

Author:

R. Matthew Emerson

Message:

Add new AREA_WATCHED type code. Bump image, fasl versions. New binaries
to follow.

Location:

trunk/source

Files:

• lib/nfcomp.lisp (modified) (1 diff)
• library/lispequ.lisp (modified) (1 diff)
• lisp-kernel/area.h (modified) (1 diff)
• lisp-kernel/image.h (modified) (1 diff)
• xdump/faslenv.lisp (modified) (1 diff)
• xdump/heap-image.lisp (modified) (1 diff)

trunk/source/lib/nfcomp.lisp

@@ -1115 +1115 @@
 ;These should be constants, but it's too much trouble when need to change 'em.
 (defparameter FASL-FILE-ID #xFF00)  ;Overall file format, shouldn't change much
-(defparameter FASL-VERSION #xFF5a)  ;Fasl block format. ($fasl-vers)
+(defparameter FASL-VERSION #xFF5b)  ;Fasl block format. ($fasl-vers)
 
 (defvar *fasdump-hash*)

trunk/source/library/lispequ.lisp

@@ -1284 +1284 @@
   tstack                                ; (dynamic-extent) temp stack
   readonly                              ; readonly section
+  watched                               ; static area containing a single object
   managed-static                        ; growable static area
   static                                ; static data in application

trunk/source/lisp-kernel/area.h

@@ -30 +30 @@
   AREA_TSTACK = 3<<fixnumshift, /* A temp stack.  It -is- doubleword-aligned */
   AREA_READONLY = 4<<fixnumshift, /* A (cfm) read-only section. */
-  AREA_MANAGED_STATIC = 5<<fixnumshift, /* A resizable static area */
-  AREA_STATIC = 6<<fixnumshift, /* A  static section: contains
+  AREA_WATCHED = 5<<fixnumshift, /* A static area containing a single object. */
+  AREA_MANAGED_STATIC = 6<<fixnumshift, /* A resizable static area */
+  AREA_STATIC = 7<<fixnumshift, /* A  static section: contains
                                  roots, but not GCed */
-  AREA_DYNAMIC = 7<<fixnumshift /* A heap. Only one such area is "the heap."*/
+  AREA_DYNAMIC = 8<<fixnumshift /* A heap. Only one such area is "the heap."*/
 } area_code;
 

trunk/source/lisp-kernel/image.h

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

trunk/source/xdump/faslenv.lisp

@@ -43 +43 @@
 (defconstant $fasl-file-id #xff00)
 (defconstant $fasl-file-id1 #xff01)
-(defconstant $fasl-vers #x5a)
-(defconstant $fasl-min-vers #x5a)
+(defconstant $fasl-vers #x5b)
+(defconstant $fasl-min-vers #x5b)
 (defconstant $faslend #xff)
 (defconstant $fasl-buf-len 2048)

trunk/source/xdump/heap-image.lisp

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