X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsave.c;h=b0a7a76b09f2b9df2c7e786205f00db86771b606;hb=78fa16bf55be44cc16845be84d98023e83fb14bc;hp=4fd98e7c9f70ac7518b668bc42059ae57295466f;hpb=1b64697e4e8a85ff8f11f5c05de71687dc5ad2e2;p=sbcl.git diff --git a/src/runtime/save.c b/src/runtime/save.c index 4fd98e7..b0a7a76 100644 --- a/src/runtime/save.c +++ b/src/runtime/save.c @@ -11,12 +11,13 @@ #include #include +#include #include #include +#include "sbcl.h" #include "runtime.h" #include "os.h" -#include "sbcl.h" #include "core.h" #include "globals.h" #include "save.h" @@ -24,6 +25,16 @@ #include "lispregs.h" #include "validate.h" #include "gc-internal.h" +#include "thread.h" + +#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) @@ -60,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); @@ -71,15 +82,16 @@ 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 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,35 +108,49 @@ 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); - /* (Now we can actually start copying ourselves into the - * output file.) */ + /* (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(VERSION_CORE_ENTRY_TYPE_CODE, file); - putw(3, file); - putw(SBCL_CORE_VERSION_INTEGER, file); - - putw(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file); - putw((5*3)+2, file); + write_lispobj(CORE_MAGIC, file); + + write_lispobj(VERSION_CORE_ENTRY_TYPE_CODE, file); + write_lispobj(3, file); + write_lispobj(SBCL_CORE_VERSION_INTEGER, 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(build_id), + file); + { + char *p; + for (p = build_id; *p; ++p) + write_lispobj(*p, 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)); + (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, @@ -132,30 +158,21 @@ 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); - 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");