From e76ee4b0a5ef8e6954c800ce813063aa35e6eff4 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Fri, 25 Nov 2011 16:57:13 +0200 Subject: [PATCH] cleanup: types in load_core_file Don't abuse lispobj for things which aren't. Instead new type word_t for "random binary gunk" in unsigned word-sized slices. Also define WORD_FMTX. --- src/runtime/coreparse.c | 32 +++++++++++++++++--------------- src/runtime/os.h | 6 ++++++ 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c index 240c8c8..0cc32a9 100644 --- a/src/runtime/coreparse.c +++ b/src/runtime/coreparse.c @@ -383,11 +383,13 @@ process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset) lispobj load_core_file(char *file, os_vm_offset_t file_offset) { - lispobj *header, val, len, *ptr, remaining_len; + void *header; + word_t val, *ptr; + os_vm_size_t len, remaining_len; int fd = open_binary(file, O_RDONLY); - unsigned int count; - + ssize_t count; 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); @@ -396,7 +398,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) } lseek(fd, file_offset, SEEK_SET); - header = calloc(os_vm_page_size / sizeof(u32), sizeof(u32)); + header = calloc(os_vm_page_size, 1); count = read(fd, header, os_vm_page_size); if (count < os_vm_page_size) { @@ -418,8 +420,8 @@ load_core_file(char *file, os_vm_offset_t file_offset) 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)); + FSHOW((stderr, "/val=0x%"WORD_FMTX", remaining_len=0x%"WORD_FMTX"\n", + val, remaining_len)); switch (val) { @@ -439,7 +441,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) case BUILD_ID_CORE_ENTRY_TYPE_CODE: SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case"); { - unsigned int i; + os_vm_size_t i; FSHOW((stderr, "build_id[]=\"%s\"\n", build_id)); FSHOW((stderr, "remaining_len = %d\n", remaining_len)); @@ -488,12 +490,12 @@ load_core_file(char *file, os_vm_offset_t file_offset) #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); + os_vm_size_t size = *ptr; + os_vm_size_t fdoffset = (*(ptr+1) + 1) * (os_vm_page_size); page_index_t offset = 0; - long bytes_read; - unsigned long data[4096]; - unsigned long word; + ssize_t bytes_read; + word_t data[4096]; + word_t word; lseek(fd, fdoffset + file_offset, SEEK_SET); while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 ))) > 0) @@ -501,7 +503,7 @@ load_core_file(char *file, os_vm_offset_t file_offset) int i = 0; size -= bytes_read; while (bytes_read) { - bytes_read -= sizeof(long); + bytes_read -= sizeof(word_t); /* 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 @@ -523,11 +525,11 @@ load_core_file(char *file, os_vm_offset_t file_offset) } #endif default: - lose("unknown core file entry: %ld\n", (long)val); + lose("unknown core file entry: 0x%"WORD_FMTX"\n", val); } ptr += remaining_len; - FSHOW((stderr, "/new ptr=%lx\n", (unsigned long)ptr)); + FSHOW((stderr, "/new ptr=0x%"WORD_FTMX"\n", ptr)); } SHOW("about to free(header)"); free(header); diff --git a/src/runtime/os.h b/src/runtime/os.h index 8384ef3..8170a70 100644 --- a/src/runtime/os.h +++ b/src/runtime/os.h @@ -189,4 +189,10 @@ extern char *os_get_runtime_executable_path(int external_path); # define OS_VM_SIZE_FMTX "lx" #endif +/* FIXME: this is not the right place for this, but here we have + * a convenient base type to hand. If it turns out we can just use + * size_t everywhere, this can more to runtime.h. */ +typedef os_vm_size_t word_t; +#define WORD_FMTX OS_VM_SIZE_FMTX + #endif -- 1.7.10.4