0.8.0.42:

[sbcl.git] / src / runtime / save.c

diff --git a/src/runtime/save.c b/src/runtime/save.c
index da73349..c8c152f 100644 (file)
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -24,6 +24,10 @@
 #include "lispregs.h"
 #include "validate.h"
 #include "gc-internal.h"
+#include "thread.h"
+
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"
 
 static long
 write_bytes(FILE *file, char *addr, long bytes)
@@ -80,6 +84,7 @@ boolean
 save(char *filename, lispobj init_function)
 {
     FILE *file;
+    struct thread *th;
 
     /* Open the output file. We don't actually need the file yet, but
      * the fopen() might fail for some reason, and we want to detect
@@ -96,9 +101,11 @@ save(char *filename, lispobj init_function)
      * being SAVE-LISP-AND-DIE instead of SAVE-LISP-AND-GO-ON). */
     printf("[undoing binding stack and other enclosing state... ");
     fflush(stdout);
-    unbind_to_here((lispobj *)BINDING_STACK_START);
-    SetSymbolValue(CURRENT_CATCH_BLOCK, 0);
-    SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0);
+    for_each_thread(th)        {       /* XXX really? */
+       unbind_to_here((lispobj *)th->binding_stack_start,th);
+       SetSymbolValue(CURRENT_CATCH_BLOCK, 0,th);
+       SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0,th);
+    }
     printf("done]\n");
     fflush(stdout);
     
@@ -132,11 +139,11 @@ save(char *filename, lispobj init_function)
     output_space(file,
                 READ_ONLY_CORE_SPACE_ID,
                 (lispobj *)READ_ONLY_SPACE_START,
-                (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
+                (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER,0));
     output_space(file,
                 STATIC_CORE_SPACE_ID,
                 (lispobj *)STATIC_SPACE_START,
-                (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER));
+                (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER,0));
 #ifdef reg_ALLOC
     output_space(file,
                 DYNAMIC_CORE_SPACE_ID,
@@ -144,23 +151,14 @@ save(char *filename, lispobj init_function)
                 dynamic_space_free_pointer);
 #else
 #ifdef LISP_FEATURE_GENCGC
-    /* I don't know too much about the circumstances in which we could
-     * end up here.  It may be that current_region_free_pointer is
-     * guaranteed to be relevant and we could skip these slightly
-     * paranoid checks.  TRT would be to rid the code of
-     * current_region_foo completely - dan 2002.09.17 */
-    if((boxed_region.free_pointer < current_region_free_pointer) &&
-       (boxed_region.end_addr == current_region_end_addr))
-       boxed_region.free_pointer = current_region_free_pointer;
     /* Flush the current_region, updating the tables. */
-    gc_alloc_update_page_tables(0,&boxed_region);
-    gc_alloc_update_page_tables(1,&unboxed_region);
+    gc_alloc_update_all_page_tables();
     update_x86_dynamic_space_free_pointer();
 #endif
     output_space(file,
                 DYNAMIC_CORE_SPACE_ID,
                 (lispobj *)DYNAMIC_SPACE_START,
-                (lispobj *)SymbolValue(ALLOCATION_POINTER));
+                (lispobj *)SymbolValue(ALLOCATION_POINTER,0));
 #endif
 
     putw(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file);