X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=12003deab350ce30d80d8f3ba6a9e038c329ac2c;hb=e4542bc034db18cf98f005b2dac53a6d7d5c7260;hp=7221bd082ede112bb8cefa67ceb70e6f0b230c4c;hpb=e02c32bd4d07a7d30c9a9d78be54f1f9f84f9877;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 7221bd0..12003de 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -2,7 +2,7 @@ * A saved SBCL system is a .core file; the code here helps us accept * such a file as input. */ - + /* * This software is part of the SBCL system. See the README file for * more information. @@ -15,158 +15,251 @@ */ #include -#include +#include +#include #include +#include +#include +#include +#include #ifdef irix #include -#include #endif +#include "sbcl.h" #include "os.h" #include "runtime.h" #include "globals.h" #include "core.h" #include "arch.h" #include "interr.h" -#include "sbcl.h" +#include "thread.h" -static void process_directory(int fd, long *ptr, int count) +#include "validate.h" +#include "gc-internal.h" + +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) { - long id = entry->identifier; - long offset = CORE_PAGESIZE * (1 + entry->data_page); - os_vm_address_t addr = - (os_vm_address_t) (CORE_PAGESIZE * entry->address); - lispobj *free_pointer = (lispobj *) addr + entry->nwords; - long len = CORE_PAGESIZE * entry->page_count; - - if (len != 0) { - os_vm_address_t real_addr; - FSHOW((stderr, "mapping %ld bytes at 0x%lx\n", len, addr)); - real_addr = os_map(fd, offset, addr, len); - if (real_addr != addr) { - lose("file mapped in wrong place! " - "(0x%08x != 0x%08lx)", - real_addr, - addr); - } - } - - FSHOW((stderr, "space id = %d, free pointer = 0x%08x\n", - id, free_pointer)); - - switch (id) { - case DYNAMIC_SPACE_ID: - if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) { - lose("core/runtime address mismatch: DYNAMIC_SPACE_START"); - } -#if defined(ibmrt) || defined(__i386__) - SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer); + long id = entry->identifier; + long offset = os_vm_page_size * (1 + entry->data_page); + os_vm_address_t addr = + (os_vm_address_t) (os_vm_page_size * entry->address); + lispobj *free_pointer = (lispobj *) addr + entry->nwords; + long len = os_vm_page_size * entry->page_count; + + if (len != 0) { + os_vm_address_t real_addr; + FSHOW((stderr, "/mapping %ld(0x%lx) bytes at 0x%lx\n", + (long)len, (long)len, (unsigned long)addr)); + real_addr = os_map(fd, offset, addr, len); + if (real_addr != addr) { + lose("file mapped in wrong place! " + "(0x%08x != 0x%08lx)", + real_addr, + addr); + } + } + + FSHOW((stderr, "/space id = %ld, free pointer = 0x%lx\n", + id, (unsigned long)free_pointer)); + + switch (id) { + case DYNAMIC_CORE_SPACE_ID: +#ifdef LISP_FEATURE_GENCGC + if (addr != (os_vm_address_t)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%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(ALLOCATION_POINTER) + SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0); #else - dynamic_space_free_pointer = free_pointer; + dynamic_space_free_pointer = free_pointer; #endif - break; - case STATIC_SPACE_ID: - if (addr != (os_vm_address_t)STATIC_SPACE_START) { - lose("core/runtime address mismatch: STATIC_SPACE_START"); - } - break; - case READ_ONLY_SPACE_ID: - if (addr != (os_vm_address_t)READ_ONLY_SPACE_START) { - lose("core/runtime address mismatch: READ_ONLY_SPACE_START"); - } - break; - default: - lose("unknown space ID %ld", id); - } + /* 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_CORE_SPACE_ID: + if (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_CORE_SPACE_ID: + if (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; + default: + lose("unknown space ID %ld addr 0x%p", id); + } } } -lispobj load_core_file(char *file) +lispobj +load_core_file(char *file) { + lispobj *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[CORE_PAGESIZE / sizeof(long)], val, len, *ptr; - long remaining_len; -#else - u32 header[CORE_PAGESIZE / sizeof(u32)], 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); + fprintf(stderr, "could not open file \"%s\"\n", file); + perror("open"); + exit(1); } - count = read(fd, header, CORE_PAGESIZE); - if (count < CORE_PAGESIZE) { - lose("premature end of core file"); + 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++; if (val != CORE_MAGIC) { - lose("invalid magic number in core: 0x%lx should have been 0x%x.", - val, - CORE_MAGIC); + lose("invalid magic number in core: 0x%lx should have been 0x%x.", + val, + CORE_MAGIC); } + SHOW("found CORE_MAGIC"); + + 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 END_CORE_ENTRY_TYPE_CODE: + SHOW("END_CORE_ENTRY_TYPE_CODE case"); + break; - while (val != CORE_END) { - val = *ptr++; - len = *ptr++; - remaining_len = len - 2; /* (-2 to cancel the two ++ operations) */ - - switch (val) { - - case CORE_END: - break; - - case CORE_VERSION: - if (*ptr != SBCL_CORE_VERSION_INTEGER) { - lose("core file version (%d) != runtime library version (%d)", - *ptr, - SBCL_CORE_VERSION_INTEGER); - } - break; - - case CORE_NDIRECTORY: - process_directory(fd, - ptr, -#ifndef alpha - remaining_len / (sizeof(struct ndir_entry) / - sizeof(long)) + 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, + SBCL_CORE_VERSION_INTEGER); + } + break; + + 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((const char *)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 LISP_FEATURE_ALPHA + remaining_len / (sizeof(struct ndir_entry) / + sizeof(long)) #else - remaining_len / (sizeof(struct ndir_entry) / - sizeof(u32)) + remaining_len / (sizeof(struct ndir_entry) / + sizeof(u32)) #endif - ); - break; + ); + break; - case CORE_INITIAL_FUNCTION: - initial_function = (lispobj)*ptr; - break; + 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); - } +#ifdef LISP_FEATURE_GENCGC + case PAGE_TABLE_CORE_ENTRY_TYPE_CODE: + { + size_t size = *ptr; + size_t fdoffset = (*(ptr+1) + 1) * (os_vm_page_size); + size_t offset = 0; + long bytes_read; + long data[4096]; + lseek(fd, fdoffset, SEEK_SET); + while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 ))) + > 0) + { + int i = 0; + size -= bytes_read; + while (bytes_read) { + bytes_read -= sizeof(long); + page_table[offset++].first_object_offset = data[i++]; + } + } - ptr += remaining_len; - } + gencgc_partial_pickup = 1; + break; + } +#endif + default: + lose("unknown core file entry: %ld", (long)val); + } + ptr += remaining_len; + FSHOW((stderr, "/new ptr=%lx\n", (unsigned long)ptr)); + } + SHOW("about to free(header)"); + free(header); + SHOW("returning from load_core_file(..)"); return initial_function; }