X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fsave.c;h=da7334949a7179b748c650b58e9e653fd5ca0278;hb=91392754bf1d241cd6913c728268caf18eae1485;hp=3e379a5d0710c451ccda8373adf1095ea747a0a1;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/runtime/save.c b/src/runtime/save.c index 3e379a5..da73349 100644 --- a/src/runtime/save.c +++ b/src/runtime/save.c @@ -9,10 +9,7 @@ * files for more information. */ -/* - * $Header$ - */ - +#include #include #include #include @@ -23,24 +20,22 @@ #include "core.h" #include "globals.h" #include "save.h" +#include "dynbind.h" #include "lispregs.h" #include "validate.h" - -#ifdef GENCGC -#include "gencgc.h" -#endif +#include "gc-internal.h" static long write_bytes(FILE *file, char *addr, long bytes) { long count, here, data; - bytes = (bytes+CORE_PAGESIZE-1)&~(CORE_PAGESIZE-1); + bytes = (bytes+os_vm_page_size-1)&~(os_vm_page_size-1); fflush(file); here = ftell(file); fseek(file, 0, 2); - data = (ftell(file)+CORE_PAGESIZE-1)&~(CORE_PAGESIZE-1); + data = (ftell(file)+os_vm_page_size-1)&~(os_vm_page_size-1); fseek(file, data, 0); while (bytes > 0) { @@ -56,7 +51,7 @@ write_bytes(FILE *file, char *addr, long bytes) } fflush(file); fseek(file, here, 0); - return data/CORE_PAGESIZE - 1; + return data/os_vm_page_size - 1; } static void @@ -71,93 +66,110 @@ output_space(FILE *file, int id, lispobj *addr, lispobj *end) bytes = words * sizeof(lispobj); - printf("writing %d bytes from the %s space at 0x%08X\n", + 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); putw(data, file); - putw((long)addr / CORE_PAGESIZE, file); - putw((bytes + CORE_PAGESIZE - 1) / CORE_PAGESIZE, file); + putw((long)addr / os_vm_page_size, file); + putw((bytes + os_vm_page_size - 1) / os_vm_page_size, file); } 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_0_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); + 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, read_only_space, + 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)); - output_space(file, STATIC_SPACE_ID, static_space, + 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, current_dynamic_space, - current_dynamic_space_free_pointer); + 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. */ +#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); update_x86_dynamic_space_free_pointer(); #endif - output_space(file, DYNAMIC_SPACE_ID, current_dynamic_space, + output_space(file, + DYNAMIC_CORE_SPACE_ID, + (lispobj *)DYNAMIC_SPACE_START, (lispobj *)SymbolValue(ALLOCATION_POINTER)); #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);