{
long count, here, data;
- bytes = (bytes+CORE_PAGESIZE-1)&~(CORE_PAGESIZE-1);
+ bytes = (bytes+os_vm_page_size-1)&~(os_vm_page_size-1);
fflush(file);
here = ftell(file);
fseek(file, 0, 2);
- data = (ftell(file)+CORE_PAGESIZE-1)&~(CORE_PAGESIZE-1);
+ data = (ftell(file)+os_vm_page_size-1)&~(os_vm_page_size-1);
fseek(file, data, 0);
while (bytes > 0) {
}
fflush(file);
fseek(file, here, 0);
- return data/CORE_PAGESIZE - 1;
+ return data/os_vm_page_size - 1;
}
static void
bytes = words * sizeof(lispobj);
- printf("writing %d bytes from the %s space at 0x%08lx\n",
- bytes, names[id], (unsigned long)addr);
+ printf("writing %ld(0x%lx) bytes from the %s(%d) space at 0x%08lx\n",
+ (long)bytes, (long)bytes, names[id], id, (unsigned long)addr);
data = write_bytes(file, (char *)addr, bytes);
putw(data, file);
- putw((long)addr / CORE_PAGESIZE, file);
- putw((bytes + CORE_PAGESIZE - 1) / CORE_PAGESIZE, file);
+ putw((long)addr / os_vm_page_size, file);
+ putw((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
}
boolean
init_function = *func_ptr;
/* Set dynamic space pointer to base value so we don't write out
* MBs of just cleared heap. */
- if(SymbolValue(X86_CGC_ACTIVE_P) != NIL)
- SetSymbolValue(ALLOCATION_POINTER, DYNAMIC_SPACE_START);
+ if(SymbolValue(X86_CGC_ACTIVE_P) != NIL) {
+ SetSymbolValue(ALLOCATION_POINTER, DYNAMIC_SPACE_START);
+ }
#endif
/* Open the file: */
unlink(filename);
putw(SBCL_CORE_VERSION_INTEGER, file);
putw(CORE_NDIRECTORY, file);
- putw((5*3)+2, file);
+ putw((5*3)+2, file); /* 3 5-word space descriptors, plus code and count */
output_space(file, READ_ONLY_SPACE_ID, (lispobj *)READ_ONLY_SPACE_START,
(lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER));
output_space(file, STATIC_SPACE_ID, (lispobj *)STATIC_SPACE_START,
(lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER));
#ifdef reg_ALLOC
- output_space(file, DYNAMIC_SPACE_ID, (lispobj *)DYNAMIC_SPACE_START,
+ output_space(file, DYNAMIC_SPACE_ID, (lispobj *)current_dynamic_space,
dynamic_space_free_pointer);
#else
#ifdef GENCGC
(lispobj *)SymbolValue(ALLOCATION_POINTER));
#endif
+ FSHOW((stderr, "/writing init_function=0x%lx\n", (long)init_function));
+ FSHOW((stderr, "/(SymbolValue(ALLOCATION_POINTER)=0x%lx\n",
+ (long)SymbolValue(ALLOCATION_POINTER)));
putw(CORE_INITIAL_FUNCTION, file);
putw(3, file);
putw(init_function, file);