X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsave.c;h=4ace124a4b8b5ec377c9e39f54f25d25883a77c6;hb=d83c8a160b4215cfc5379dd4fb70c9589a428ae0;hp=c8c152f09dac92c1ce2e8ea3fe4a292207ef28e0;hpb=e365f2f7a9c66d307b48fee70778f4eaa84bdcc0;p=sbcl.git

diff --git a/src/runtime/save.c b/src/runtime/save.c
index c8c152f..4ace124 100644
--- a/src/runtime/save.c
+++ b/src/runtime/save.c
@@ -11,12 +11,13 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.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"
@@ -29,6 +30,12 @@
 #include "genesis/static-symbols.h"
 #include "genesis/symbol.h"
 
+static void
+write_lispobj(lispobj obj, FILE *file)
+{
+    fwrite(&obj, sizeof(lispobj), 1, file);
+}
+
 static long
 write_bytes(FILE *file, char *addr, long bytes)
 {
@@ -64,9 +71,9 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end)
     int words, bytes, data;
     static char *names[] = {NULL, "dynamic", "static", "read-only"};
 
-    putw(id, file);
+    write_lispobj(id, file);
     words = end - addr;
-    putw(words, file);
+    write_lispobj(words, file);
 
     bytes = words * sizeof(lispobj);
 
@@ -75,9 +82,9 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end)
 
     data = write_bytes(file, (char *)addr, bytes);
 
-    putw(data, file);
-    putw((long)addr / os_vm_page_size, file);
-    putw((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
+    write_lispobj(data, file);
+    write_lispobj((long)addr / os_vm_page_size, file);
+    write_lispobj((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
 }
 
 boolean
@@ -101,54 +108,54 @@ 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);
-    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);
+    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);
+    write_lispobj(CORE_MAGIC, file);
 
-    putw(VERSION_CORE_ENTRY_TYPE_CODE, file);
-    putw(3, file);
-    putw(SBCL_CORE_VERSION_INTEGER, file);
+    write_lispobj(VERSION_CORE_ENTRY_TYPE_CODE, file);
+    write_lispobj(3, file);
+    write_lispobj(SBCL_CORE_VERSION_INTEGER, 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);
+    write_lispobj(BUILD_ID_CORE_ENTRY_TYPE_CODE, file);
+    write_lispobj(/* (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((const char *)build_id),
+         file);
     {
-	char *p;
-	for (p = build_id; *p; ++p)
-	    putw(*p, file);
+        unsigned char *p;
+        for (p = build_id; *p; ++p)
+            write_lispobj(*p, file);
     }
 
-    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);
+    write_lispobj(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file);
+    write_lispobj(/* (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));
+                 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));
+                 STATIC_CORE_SPACE_ID,
+                 (lispobj *)STATIC_SPACE_START,
+                 (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER,0));
 #ifdef reg_ALLOC
     output_space(file,
-		 DYNAMIC_CORE_SPACE_ID,
-		 (lispobj *)current_dynamic_space,
-		 dynamic_space_free_pointer);
+                 DYNAMIC_CORE_SPACE_ID,
+                 (lispobj *)current_dynamic_space,
+                 dynamic_space_free_pointer);
 #else
 #ifdef LISP_FEATURE_GENCGC
     /* Flush the current_region, updating the tables. */
@@ -156,16 +163,16 @@ save(char *filename, lispobj init_function)
     update_x86_dynamic_space_free_pointer();
 #endif
     output_space(file,
-		 DYNAMIC_CORE_SPACE_ID,
-		 (lispobj *)DYNAMIC_SPACE_START,
-		 (lispobj *)SymbolValue(ALLOCATION_POINTER,0));
+                 DYNAMIC_CORE_SPACE_ID,
+                 (lispobj *)DYNAMIC_SPACE_START,
+                 (lispobj *)SymbolValue(ALLOCATION_POINTER,0));
 #endif
 
-    putw(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file);
-    putw(3, file);
-    putw(init_function, file);
+    write_lispobj(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file);
+    write_lispobj(3, file);
+    write_lispobj(init_function, file);
 
-    putw(END_CORE_ENTRY_TYPE_CODE, file);
+    write_lispobj(END_CORE_ENTRY_TYPE_CODE, file);
 
     fclose(file);
     printf("done]\n");