X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=9ae910c9c02809ec5712d506b59c33f627deef63;hb=c8617f57d0413beb2890e94dabe227cef9c5ddad;hp=a1da36ebed2dcc5cabd4a54515d856226db60f27;hpb=b727b3bff6f2a989e8e20e199945c2bf768214a9;p=sbcl.git diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index a1da36e..9ae910c 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -280,14 +280,15 @@ process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset) FSHOW((stderr, "/process_directory(..), count=%d\n", count)); for (entry = (struct ndir_entry *) ptr; --count>= 0; ++entry) { + compressed = 0; - long id = entry->identifier; + sword_t id = entry->identifier; if (id <= (MAX_CORE_SPACE_ID | DEFLATED_CORE_SPACE_ID_FLAG)) { if (id & DEFLATED_CORE_SPACE_ID_FLAG) compressed = 1; id &= ~(DEFLATED_CORE_SPACE_ID_FLAG); } - long offset = os_vm_page_size * (1 + entry->data_page); + sword_t 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; @@ -514,7 +515,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) * The low bits of each word are allocation flags. */ if ((word=data[i])) { - page_table[offset].region_start_offset = word & ~0x03; + page_table[offset].scan_start_offset = word & ~0x03; page_table[offset].allocated = word & 0x03; } i++;