Changeset 11551 for trunk/source/lisp-kernel/image.c

Timestamp:

Dec 26, 2008, 2:49:51 AM (12 years ago)

Author:

gb

Message:

Not the bug I was looking for either, but un-botch some of the GC-state-saving
changes from a few weeks ago: save_application() is always run with the
EGC off, so make the caller pass an extra arg indicating its state as of
the time we trapped to it. Set G2_THRESHOLD global before writing image,
don't set G1_THRESHOLD twice.

Images built a few weeks ago have EGC off and misconfigured.

File:

• trunk/source/lisp-kernel/image.c (modified) (2 diffs)

trunk/source/lisp-kernel/image.c

@@ -394 +394 @@
 
 OSErr
-save_application(unsigned fd)
+save_application(unsigned fd, Boolean egc_was_enabled)
 {
   openmcl_image_file_header fh;
@@ -462 +462 @@
     lisp_global(G0_THRESHOLD) = g0_area->threshold;
     lisp_global(G1_THRESHOLD) = g1_area->threshold;
-    lisp_global(G1_THRESHOLD) = g2_area->threshold;
-    lisp_global(EGC_ENABLED) = (LispObj)(active_dynamic_area->older != NULL);
+    lisp_global(G2_THRESHOLD) = g2_area->threshold;
+    lisp_global(EGC_ENABLED) = (LispObj)egc_was_enabled;
   }
   /*