X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=354040bbe1da4e6df710e0c240cf9f32ab7bf49b;hb=854a7c8f6987e05b6aebe186f30b7e125693afaf;hp=dd74c749959bbcc8c0965d4fe758dec2d03cd849;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index dd74c74..354040b 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" @@ -36,12 +32,76 @@ #include "interr.h" #include "thread.h" +#include "validate.h" +#include "gc-internal.h" + 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, u32 *ptr, int count, os_vm_offset_t file_offset) { struct ndir_entry *entry; @@ -59,18 +119,18 @@ process_directory(int fd, u32 *ptr, int 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, addr)); - real_addr = os_map(fd, offset, addr, len); + (long)len, (long)len, (unsigned long)addr)); + 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); } } - FSHOW((stderr, "/space id = %d, free pointer = 0x%08x\n", - id, (long)free_pointer)); + FSHOW((stderr, "/space id = %ld, free pointer = 0x%lx\n", + id, (unsigned long)free_pointer)); switch (id) { case DYNAMIC_CORE_SPACE_ID: @@ -78,7 +138,7 @@ process_directory(int fd, u32 *ptr, int count) 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) && @@ -87,7 +147,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) @@ -105,27 +165,27 @@ 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), count; lispobj initial_function = NIL; FSHOW((stderr, "/entering load_core_file(%s)\n", file)); @@ -135,11 +195,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"); @@ -147,7 +208,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); } @@ -169,7 +230,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); } @@ -182,7 +243,7 @@ load_core_file(char *file) FSHOW((stderr, "build_id[]=\"%s\"\n", build_id)); FSHOW((stderr, "remaining_len = %d\n", remaining_len)); - if (remaining_len != strlen(build_id)) + 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", @@ -202,7 +263,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: @@ -211,12 +272,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: @@ -224,15 +285,40 @@ load_core_file(char *file) initial_function = (lispobj)*ptr; break; +#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 + file_offset, 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++]; + } + } + + gencgc_partial_pickup = 1; + break; + } +#endif default: - lose("unknown core file entry: %ld", (long)val); + lose("unknown core file entry: %ld\n", (long)val); } ptr += remaining_len; - FSHOW((stderr, "/new ptr=%x\n", ptr)); + 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; } +