X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=d657bac7e96a488d3c021d003188e57772f27979;hb=66cff1e1319861c080d563359afea284614b3a7f;hp=4b4998f033e429a9257fae639d2d85439556db02;hpb=bd455348d39bee562296741689882dcb97c46ba3;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 4b4998f..d657bac 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -38,10 +38,11 @@ /* 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[] = +char build_id[] = #include "../../output/build-id.tmp" ; @@ -324,7 +325,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) struct lutex *lutex = lutexes_to_resurrect[i]; FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex)); - lutex_init(lutex); + lutex_init((tagged_lutex_t) lutex); } free(lutexes_to_resurrect); @@ -349,7 +350,16 @@ load_core_file(char *file, os_vm_offset_t file_offset) 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++; } }