X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsave.c;h=e901d989ef37f037112c26cf169466ff93fe8a83;hb=ded744f74ab2f1a97679ad4f91e0eb8d995daef2;hp=5059aa5508798de3428f40ac136d5b8c6595ce27;hpb=6cbe4d8ba6d7bc469d03a72514c789b1f3944878;p=sbcl.git

diff --git a/src/runtime/save.c b/src/runtime/save.c
index 5059aa5..e901d98 100644
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -9,23 +9,25 @@
  * files for more information.
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sys/file.h>
 
+#include "sbcl.h"
 #include "runtime.h"
 #include "os.h"
-#include "sbcl.h"
 #include "core.h"
 #include "globals.h"
 #include "save.h"
 #include "dynbind.h"
 #include "lispregs.h"
 #include "validate.h"
+#include "gc-internal.h"
+#include "thread.h"
 
-#ifdef GENCGC
-#include "gencgc.h"
-#endif
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"
 
 static long
 write_bytes(FILE *file, char *addr, long bytes)
@@ -82,56 +84,90 @@ boolean
 save(char *filename, lispobj init_function)
 {
     FILE *file;
-    /* Open the 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
+     * that and back out before we do anything irreversible. */
     unlink(filename);
     file = fopen(filename, "w");
-    if (file == NULL) {
+    if (!file) {
         perror(filename);
         return 1;
     }
-    printf("[undoing binding stack... ");
+
+    /* Smash the enclosing state. (Once we do this, there's no good
+     * way to go back, which is a sufficient reason that this ends up
+     * 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);
-    SetSymbolValue(EVAL_STACK_TOP, 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);
+    
+    /* (Now we can actually start copying ourselves into the output file.) */
+
     printf("[saving current Lisp image into %s:\n", filename);
+    fflush(stdout);
 
     putw(CORE_MAGIC, file);
 
-    putw(CORE_VERSION, file);
+    putw(VERSION_CORE_ENTRY_TYPE_CODE, file);
     putw(3, file);
     putw(SBCL_CORE_VERSION_INTEGER, file);
 
-    putw(CORE_NDIRECTORY, file);
-    putw((5*3)+2, file);
+    putw(BUILD_ID_CORE_ENTRY_TYPE_CODE, file);
+    putw(/* (We're writing the word count of the entry here, and the 2
+	  * term is one word for the leading BUILD_ID_CORE_ENTRY_TYPE_CODE
+	  * word and one word where we store the count itself.) */
+	 2 + strlen(build_id),
+	 file);
+    {
+	char *p;
+	for (p = build_id; *p; ++p)
+	    putw(*p, file);
+    }
 
-    output_space(file, READ_ONLY_SPACE_ID, (lispobj *)READ_ONLY_SPACE_START,
-		 (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
-    output_space(file, STATIC_SPACE_ID, (lispobj *)STATIC_SPACE_START,
-		 (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER));
+    putw(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file);
+    putw(/* (word count = 3 spaces described by 5 words each, plus the
+	  * entry type code, plus this count itself) */
+	 (5*3)+2, file);
+    output_space(file,
+		 READ_ONLY_CORE_SPACE_ID,
+		 (lispobj *)READ_ONLY_SPACE_START,
+		 (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,0));
 #ifdef reg_ALLOC
-    output_space(file, DYNAMIC_SPACE_ID, (lispobj *)current_dynamic_space,
+    output_space(file,
+		 DYNAMIC_CORE_SPACE_ID,
+		 (lispobj *)current_dynamic_space,
 		 dynamic_space_free_pointer);
 #else
-#ifdef GENCGC
-    /* Flush the current_region updating the tables. */
-    gc_alloc_update_page_tables(0,&boxed_region);
-    gc_alloc_update_page_tables(1,&unboxed_region);
+#ifdef LISP_FEATURE_GENCGC
+    /* Flush the current_region, updating the tables. */
+    gc_alloc_update_all_page_tables();
     update_x86_dynamic_space_free_pointer();
 #endif
-    output_space(file, DYNAMIC_SPACE_ID, (lispobj *)DYNAMIC_SPACE_START,
-		 (lispobj *)SymbolValue(ALLOCATION_POINTER));
+    output_space(file,
+		 DYNAMIC_CORE_SPACE_ID,
+		 (lispobj *)DYNAMIC_SPACE_START,
+		 (lispobj *)SymbolValue(ALLOCATION_POINTER,0));
 #endif
 
-    putw(CORE_INITIAL_FUNCTION, file);
+    putw(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file);
     putw(3, file);
     putw(init_function, file);
 
-    putw(CORE_END, file);
-    fclose(file);
+    putw(END_CORE_ENTRY_TYPE_CODE, file);
 
+    fclose(file);
     printf("done]\n");
 
     exit(0);