X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=ec5a100f3515cd82c0aed6a627fd10335ea9db75;hb=7a79c7338b8c8fb6d84a275d7c0e51ce93150059;hp=12003deab350ce30d80d8f3ba6a9e038c329ac2c;hpb=9524f32119c687023c20f181cdf47f0125f59c60;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 12003de..ec5a100 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -23,10 +23,6 @@ #include #include -#ifdef irix -#include -#endif - #include "sbcl.h" #include "os.h" #include "runtime.h" @@ -39,12 +35,80 @@ #include "validate.h" #include "gc-internal.h" +/* lutex stuff */ +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) +#include "genesis/sap.h" +#include "pthread-lutex.h" +#endif + + unsigned char build_id[] = #include "../../output/build-id.tmp" ; +int +open_binary(char *filename, int mode) +{ +#ifdef LISP_FEATURE_WIN32 + mode |= O_BINARY; +#endif + + return open(filename, mode); +} + +/* Search 'filename' for an embedded core. An SBCL core has, at the + * end of the file, a trailer containing the size of the core (an + * os_vm_offset_t) and a final signature word (the lispobj + * CORE_MAGIC). If this trailer is found at the end of the file, the + * start of the core can be determined from the core size. + * + * If an embedded core is present, this returns the offset into the + * file to load the core from, or -1 if no core is present. */ +os_vm_offset_t +search_for_embedded_core(char *filename) +{ + lispobj header; + os_vm_offset_t lispobj_size = sizeof(lispobj); + os_vm_offset_t trailer_size = lispobj_size + sizeof(os_vm_offset_t); + os_vm_offset_t core_size, pos; + int fd = -1; + + if ((fd = open_binary(filename, O_RDONLY)) < 0) + goto lose; + if (lseek(fd, -lispobj_size, SEEK_END) < 0) + goto lose; + if (read(fd, &header, (size_t)lispobj_size) < lispobj_size) + goto lose; + + if (header == CORE_MAGIC) { + if (lseek(fd, -trailer_size, SEEK_END) < 0) + goto lose; + if (read(fd, &core_size, sizeof(os_vm_offset_t)) < 0) + goto lose; + + if (lseek(fd, -(core_size + trailer_size), SEEK_END) < 0) + goto lose; + pos = lseek(fd, 0, SEEK_CUR); + + if (read(fd, &header, (size_t)lispobj_size) < lispobj_size) + goto lose; + + if (header != CORE_MAGIC) + goto lose; + + close(fd); + return pos; + } + +lose: + if (fd != -1) + close(fd); + + return -1; +} + static void -process_directory(int fd, u32 *ptr, int count) +process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset) { struct ndir_entry *entry; @@ -57,16 +121,16 @@ process_directory(int fd, u32 *ptr, int count) 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; + unsigned 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); + real_addr = os_map(fd, offset + file_offset, addr, len); if (real_addr != addr) { lose("file mapped in wrong place! " - "(0x%08x != 0x%08lx)", + "(0x%08x != 0x%08lx)\n", real_addr, addr); } @@ -77,11 +141,18 @@ process_directory(int fd, u32 *ptr, int count) switch (id) { case DYNAMIC_CORE_SPACE_ID: + if (len > dynamic_space_size) { + fprintf(stderr, + "dynamic space too small for core: %ldKiB required, %ldKiB available.\n", + len >> 10, + (long)dynamic_space_size >> 10); + exit(1); + } #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"); + lose("core/runtime address mismatch: DYNAMIC_SPACE_START\n"); } #else if ((addr != (os_vm_address_t)DYNAMIC_0_SPACE_START) && @@ -90,7 +161,7 @@ process_directory(int fd, u32 *ptr, int count) (long)addr, (long)DYNAMIC_0_SPACE_START, (long)DYNAMIC_1_SPACE_START); - lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START"); + lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START\n"); } #endif #if defined(ALLOCATION_POINTER) @@ -108,27 +179,28 @@ process_directory(int fd, u32 *ptr, int count) 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"); + lose("core/runtime address mismatch: STATIC_SPACE_START\n"); } 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"); + lose("core/runtime address mismatch: READ_ONLY_SPACE_START\n"); } break; default: - lose("unknown space ID %ld addr 0x%p", id); + lose("unknown space ID %ld addr 0x%lx\n", id, (long)addr); } } } lispobj -load_core_file(char *file) +load_core_file(char *file, os_vm_offset_t file_offset) { lispobj *header, val, len, *ptr, remaining_len; - int fd = open(file, O_RDONLY), count; + int fd = open_binary(file, O_RDONLY); + unsigned int count; lispobj initial_function = NIL; FSHOW((stderr, "/entering load_core_file(%s)\n", file)); @@ -138,11 +210,12 @@ load_core_file(char *file) exit(1); } + lseek(fd, file_offset, SEEK_SET); 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"); + lose("premature end of core file\n"); } SHOW("successfully read first page of core"); @@ -150,7 +223,7 @@ load_core_file(char *file) val = *ptr++; if (val != CORE_MAGIC) { - lose("invalid magic number in core: 0x%lx should have been 0x%x.", + lose("invalid magic number in core: 0x%lx should have been 0x%x.\n", val, CORE_MAGIC); } @@ -172,7 +245,7 @@ load_core_file(char *file) 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)", + lose("core file version (%d) != runtime library version (%d)\n", *ptr, SBCL_CORE_VERSION_INTEGER); } @@ -181,7 +254,7 @@ load_core_file(char *file) case BUILD_ID_CORE_ENTRY_TYPE_CODE: SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case"); { - int i; + unsigned int i; FSHOW((stderr, "build_id[]=\"%s\"\n", build_id)); FSHOW((stderr, "remaining_len = %d\n", remaining_len)); @@ -205,7 +278,7 @@ load_core_file(char *file) * was changed, but people experimenting with patches * don't necessarily update version.lisp-expr.) */ - lose("can't load .core for different runtime, sorry"); + lose("can't load .core for different runtime, sorry\n"); } case NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE: @@ -214,12 +287,12 @@ load_core_file(char *file) ptr, #ifndef LISP_FEATURE_ALPHA remaining_len / (sizeof(struct ndir_entry) / - sizeof(long)) + sizeof(long)), #else remaining_len / (sizeof(struct ndir_entry) / - sizeof(u32)) + sizeof(u32)), #endif - ); + file_offset); break; case INITIAL_FUN_CORE_ENTRY_TYPE_CODE: @@ -227,6 +300,41 @@ load_core_file(char *file) initial_function = (lispobj)*ptr; break; +#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) + case LUTEX_TABLE_CORE_ENTRY_TYPE_CODE: + SHOW("LUTEX_TABLE_CORE_ENTRY_TYPE_CODE case"); + { + size_t n_lutexes = *ptr; + size_t fdoffset = (*(ptr + 1) + 1) * (os_vm_page_size); + size_t data_length = n_lutexes * sizeof(struct sap *); + struct lutex **lutexes_to_resurrect = malloc(data_length); + long bytes_read; + + lseek(fd, fdoffset + file_offset, SEEK_SET); + + FSHOW((stderr, "attempting to read %ld lutexes from core\n", n_lutexes)); + bytes_read = read(fd, lutexes_to_resurrect, data_length); + + /* XXX */ + if (bytes_read != data_length) { + lose("Could not read the lutex table"); + } + else { + int i; + + for (i=0; i 0) { @@ -243,7 +351,16 @@ load_core_file(char *file) size -= bytes_read; while (bytes_read) { bytes_read -= sizeof(long); - page_table[offset++].first_object_offset = data[i++]; + /* Ignore all zeroes. The size of the page table + * core entry was rounded up to os_vm_page_size + * during the save, and might now have more + * elements than the page table. + */ + if (data[i]) { + page_table[offset].first_object_offset = data[i]; + } + i++; + offset++; } } @@ -252,7 +369,7 @@ load_core_file(char *file) } #endif default: - lose("unknown core file entry: %ld", (long)val); + lose("unknown core file entry: %ld\n", (long)val); } ptr += remaining_len; @@ -263,3 +380,4 @@ load_core_file(char *file) SHOW("returning from load_core_file(..)"); return initial_function; } +