X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=6ac74bac77f88e1bd7779ac0794696ce46bcc239;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=ffcce84291cb9a42c120ce4500478cdb30e03598;hpb=dfa55a883f94470267b626dae77ce7e7dfac3df6;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index ffcce84..6ac74ba 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -15,12 +15,15 @@ */ #include -#include +#include #include +#include +#include +#include +#include #ifdef irix #include -#include #endif #include "os.h" @@ -30,12 +33,18 @@ #include "arch.h" #include "interr.h" #include "sbcl.h" +#include "thread.h" -static void process_directory(int fd, long *ptr, int count) +unsigned char build_id[] = +#include "../../output/build-id.tmp" +; + +static void +process_directory(int fd, u32 *ptr, int count) { struct ndir_entry *entry; - FSHOW((stderr, "process_directory(..), count=%d\n", count)); + FSHOW((stderr, "/process_directory(..), count=%d\n", count)); for (entry = (struct ndir_entry *) ptr; --count>= 0; ++entry) { @@ -48,7 +57,8 @@ static void process_directory(int fd, long *ptr, int count) if (len != 0) { os_vm_address_t real_addr; - FSHOW((stderr, "mapping %ld bytes at 0x%lx\n", len, addr)); + FSHOW((stderr, "/mapping %ld(0x%lx) bytes at 0x%lx\n", + (long)len, (long)len, addr)); real_addr = os_map(fd, offset, addr, len); if (real_addr != addr) { lose("file mapped in wrong place! " @@ -58,45 +68,52 @@ static void process_directory(int fd, long *ptr, int count) } } - FSHOW((stderr, "space id = %d, free pointer = 0x%08x\n", - id, free_pointer)); + FSHOW((stderr, "/space id = %d, free pointer = 0x%08x\n", + id, (long)free_pointer)); switch (id) { - case DYNAMIC_SPACE_ID: -#ifdef GENCGC + case DYNAMIC_CORE_SPACE_ID: +#ifdef LISP_FEATURE_GENCGC if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) { - fprintf(stderr, "in core: 0x%x - in runtime: 0x%x \n", - addr, (os_vm_address_t)DYNAMIC_SPACE_START); - fprintf(stderr,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START"); + fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx \n", + (long)addr, (long)DYNAMIC_SPACE_START); + lose("core/runtime address mismatch: DYNAMIC_SPACE_START"); } #else if ((addr != (os_vm_address_t)DYNAMIC_0_SPACE_START) && (addr != (os_vm_address_t)DYNAMIC_1_SPACE_START)) { - fprintf(stderr, "in core: 0x%x - in runtime: 0x%x or 0x%x\n", - addr, (os_vm_address_t)DYNAMIC_0_SPACE_START, - (os_vm_address_t)DYNAMIC_1_SPACE_START); - fprintf(stderr,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START"); + fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx or 0x%lx\n", + (long)addr, + (long)DYNAMIC_0_SPACE_START, + (long)DYNAMIC_1_SPACE_START); + lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START"); } #endif -#if defined(ibmrt) || defined(__i386__) - SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer); +/* FIXME: Should the conditional here be reg_ALLOC instead of + * defined(LISP_FEATURE_X86) + * ? */ +#if defined(LISP_FEATURE_X86) + SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0); #else dynamic_space_free_pointer = free_pointer; #endif - /* on the x86, this will always be space 0 */ + /* For stop-and-copy GC, this will be whatever the GC was + * using at the time. With GENCGC, this will always be + * space 0. (We checked above that for GENCGC, + * addr==DYNAMIC_SPACE_START.) */ current_dynamic_space = (lispobj *)addr; break; - case STATIC_SPACE_ID: + case STATIC_CORE_SPACE_ID: if (addr != (os_vm_address_t)STATIC_SPACE_START) { - fprintf(stderr, "in core: 0x%p - in runtime: 0x%x\n", - addr, (os_vm_address_t)STATIC_SPACE_START); + fprintf(stderr, "in core: 0x%lx - in runtime: 0x%lx\n", + (long)addr, (long)STATIC_SPACE_START); lose("core/runtime address mismatch: STATIC_SPACE_START"); } break; - case READ_ONLY_SPACE_ID: + case READ_ONLY_CORE_SPACE_ID: if (addr != (os_vm_address_t)READ_ONLY_SPACE_START) { - fprintf(stderr, "in core: 0x%x - in runtime: 0x%x\n", - addr, (os_vm_address_t)READ_ONLY_SPACE_START); + fprintf(stderr, "in core: 0x%lx - in runtime: 0x%lx\n", + (long)addr, (long)READ_ONLY_SPACE_START); lose("core/runtime address mismatch: READ_ONLY_SPACE_START"); } break; @@ -106,35 +123,27 @@ static void process_directory(int fd, long *ptr, int count) } } -lispobj load_core_file(char *file) +lispobj +load_core_file(char *file) { + u32 *header, val, len, *ptr, remaining_len; int fd = open(file, O_RDONLY), count; - /* KLUDGE: This kind of conditionalization everywhere that 32-bit - * ints are used is really nasty. It would be much nicer to define - * a typedef like addr_as_int once and for all in each - * architecture file, then use that everywhere. -- WHN 19990904 */ -#ifndef alpha - long *header, val, len, *ptr; - long remaining_len; -#else - u32 *header, val, len, *ptr; - u32 remaining_len; -#endif - lispobj initial_function = NIL; + FSHOW((stderr, "/entering load_core_file(%s)\n", file)); if (fd < 0) { fprintf(stderr, "could not open file \"%s\"\n", file); perror("open"); exit(1); } - header=calloc(os_vm_page_size / sizeof(u32),sizeof(u32)); + header = calloc(os_vm_page_size / sizeof(u32), sizeof(u32)); count = read(fd, header, os_vm_page_size); if (count < os_vm_page_size) { lose("premature end of core file"); } + SHOW("successfully read first page of core"); ptr = header; val = *ptr++; @@ -144,18 +153,23 @@ lispobj load_core_file(char *file) val, CORE_MAGIC); } + SHOW("found CORE_MAGIC"); - while (val != CORE_END) { + while (val != END_CORE_ENTRY_TYPE_CODE) { val = *ptr++; len = *ptr++; remaining_len = len - 2; /* (-2 to cancel the two ++ operations) */ + FSHOW((stderr, "/val=0x%ld, remaining_len=0x%ld\n", + (long)val, (long)remaining_len)); switch (val) { - case CORE_END: + case END_CORE_ENTRY_TYPE_CODE: + SHOW("END_CORE_ENTRY_TYPE_CODE case"); break; - case CORE_VERSION: + case VERSION_CORE_ENTRY_TYPE_CODE: + SHOW("VERSION_CORE_ENTRY_TYPE_CODE case"); if (*ptr != SBCL_CORE_VERSION_INTEGER) { lose("core file version (%d) != runtime library version (%d)", *ptr, @@ -163,7 +177,38 @@ lispobj load_core_file(char *file) } break; - case CORE_NDIRECTORY: + case BUILD_ID_CORE_ENTRY_TYPE_CODE: + SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case"); + { + int i; + + FSHOW((stderr, "build_id[]=\"%s\"\n", build_id)); + FSHOW((stderr, "remaining_len = %d\n", remaining_len)); + if (remaining_len != strlen(build_id)) + goto losing_build_id; + for (i = 0; i < remaining_len; ++i) { + FSHOW((stderr, "ptr[%d] = char = %d, expected=%d\n", + i, ptr[i], build_id[i])); + if (ptr[i] != build_id[i]) + goto losing_build_id; + } + break; + losing_build_id: + /* .core files are not binary-compatible between + * builds because we can't easily detect whether the + * sources were patched between the time the + * dumping-the-.core runtime was built and the time + * that the loading-the-.core runtime was built. + * + * (We could easily detect whether version.lisp-expr + * was changed, but people experimenting with patches + * don't necessarily update version.lisp-expr.) */ + + lose("can't load .core for different runtime, sorry"); + } + + case NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE: + SHOW("NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE case"); process_directory(fd, ptr, #ifndef alpha @@ -176,16 +221,20 @@ lispobj load_core_file(char *file) ); break; - case CORE_INITIAL_FUNCTION: + case INITIAL_FUN_CORE_ENTRY_TYPE_CODE: + SHOW("INITIAL_FUN_CORE_ENTRY_TYPE_CODE case"); initial_function = (lispobj)*ptr; break; default: - lose("unknown core file entry: %ld", val); + lose("unknown core file entry: %ld", (long)val); } ptr += remaining_len; + FSHOW((stderr, "/new ptr=%x\n", ptr)); } + SHOW("about to free(header)"); free(header); + SHOW("returning from load_core_file(..)"); return initial_function; }