projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support building without PSEUDO-ATOMIC on POSIX safepoints
[sbcl.git]
/
src
/
runtime
/
coreparse.c
diff --git
a/src/runtime/coreparse.c
b/src/runtime/coreparse.c
index
9dc3157
..
46ff537
100644
(file)
--- a/
src/runtime/coreparse.c
+++ b/
src/runtime/coreparse.c
@@
-280,22
+280,23
@@
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) {
FSHOW((stderr, "/process_directory(..), count=%d\n", count));
for (entry = (struct ndir_entry *) ptr; --count>= 0; ++entry) {
+
compressed = 0;
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);
}
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;
os_vm_address_t addr =
(os_vm_address_t) (os_vm_page_size * entry->address);
lispobj *free_pointer = (lispobj *) addr + entry->nwords;
- unsigned long len = os_vm_page_size * entry->page_count;
+ uword_t 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",
if (len != 0) {
os_vm_address_t real_addr;
FSHOW((stderr, "/mapping %ld(0x%lx) bytes at 0x%lx\n",
- len, len, (unsigned long)addr));
+ len, len, (uword_t)addr));
if (compressed) {
#ifdef LISP_FEATURE_SB_CORE_COMPRESSION
real_addr = inflate_core_bytes(fd, offset + file_offset, addr, len);
if (compressed) {
#ifdef LISP_FEATURE_SB_CORE_COMPRESSION
real_addr = inflate_core_bytes(fd, offset + file_offset, addr, len);
@@
-323,9
+324,8
@@
process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
madvise(addr, len, MADV_MERGEABLE);
}
#endif
madvise(addr, len, MADV_MERGEABLE);
}
#endif
-
- FSHOW((stderr, "/space id = %ld, free pointer = 0x%lx\n",
- id, (unsigned long)free_pointer));
+ FSHOW((stderr, "/space id = %ld, free pointer = 0x%p\n",
+ id, (uword_t)free_pointer));
switch (id) {
case DYNAMIC_CORE_SPACE_ID:
switch (id) {
case DYNAMIC_CORE_SPACE_ID:
@@
-477,7
+477,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
ptr,
#ifndef LISP_FEATURE_ALPHA
remaining_len / (sizeof(struct ndir_entry) /
ptr,
#ifndef LISP_FEATURE_ALPHA
remaining_len / (sizeof(struct ndir_entry) /
- sizeof(long)),
+ sizeof(lispobj)),
#else
remaining_len / (sizeof(struct ndir_entry) /
sizeof(u32)),
#else
remaining_len / (sizeof(struct ndir_entry) /
sizeof(u32)),