0.7.5.18:

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

diff --git a/src/runtime/save.c b/src/runtime/save.c
index 2c527f8..1c50cca 100644 (file)
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -9,6 +9,7 @@
  * files for more information.
  */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sys/file.h>
@@ -68,8 +69,8 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end)
 
     bytes = words * sizeof(lispobj);
 
-    printf("writing %ld(0x%lx) bytes from the %s(%d) space at 0x%08lx\n",
-           (long)bytes, (long)bytes, names[id], id, (unsigned long)addr);
+    printf("writing %d bytes from the %s space at 0x%08lx\n",
+           bytes, names[id], (unsigned long)addr);
 
     data = write_bytes(file, (char *)addr, bytes);
 
@@ -82,81 +83,76 @@ boolean
 save(char *filename, lispobj init_function)
 {
     FILE *file;
-#if defined WANT_CGC
-    volatile lispobj*func_ptr = &init_function;
-    char sbuf[128];
-    strcpy(sbuf,filename);
-    filename=sbuf;
-    /* Get rid of remnant stuff. This is a MUST so that the memory
-     * manager can get started correctly when we restart after this
-     * save. Purify is going to maybe move the args so we need to
-     * consider them volatile, especially if the gcc optimizer is
-     * working!! */
-    purify(NIL,NIL);
-
-    init_function = *func_ptr;
-    /* Set dynamic space pointer to base value so we don't write out
-     * MBs of just cleared heap. */
-    if(SymbolValue(X86_CGC_ACTIVE_P) != NIL) {
-       SetSymbolValue(ALLOCATION_POINTER, DYNAMIC_SPACE_START);
-    }
-#endif
-    /* Open the file: */
+
+    /* 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);
     printf("done]\n");
-#if defined WANT_CGC && defined X86_CGC_ACTIVE_P
-    SetSymbolValue(X86_CGC_ACTIVE_P, T);
-#endif
+    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); /* 3 5-word space descriptors, plus code and count */
+    putw(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file);
+    putw((5*3)+2, file);
 
-    output_space(file, READ_ONLY_SPACE_ID, (lispobj *)READ_ONLY_SPACE_START,
+    output_space(file,
+                READ_ONLY_CORE_SPACE_ID,
+                (lispobj *)READ_ONLY_SPACE_START,
                 (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
-    output_space(file, STATIC_SPACE_ID, (lispobj *)STATIC_SPACE_START,
+    output_space(file,
+                STATIC_CORE_SPACE_ID,
+                (lispobj *)STATIC_SPACE_START,
                 (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER));
 #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. */
+    /* Flush the current_region, updating the tables. */
     gc_alloc_update_page_tables(0,&boxed_region);
     gc_alloc_update_page_tables(1,&unboxed_region);
     update_x86_dynamic_space_free_pointer();
 #endif
-    output_space(file, DYNAMIC_SPACE_ID, (lispobj *)DYNAMIC_SPACE_START,
+    output_space(file,
+                DYNAMIC_CORE_SPACE_ID,
+                (lispobj *)DYNAMIC_SPACE_START,
                 (lispobj *)SymbolValue(ALLOCATION_POINTER));
 #endif
 
-    FSHOW((stderr, "/writing init_function=0x%lx\n", (long)init_function));
-    FSHOW((stderr, "/(SymbolValue(ALLOCATION_POINTER)=0x%lx\n",
-          (long)SymbolValue(ALLOCATION_POINTER)));
-    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);