{
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
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
save(char *filename, lispobj init_function)
{
FILE *file;
-#if defined WANT_CGC
- volatile lispobj*func_ptr = &init_function;
- char sbuf[128];
- strcpy(sbuf,filename);
- filename=sbuf;
- /* Get rid of remnant stuff. This is a MUST so that
- * the memory manager can get started correctly when
- * we restart after this save. Purify is going to
- * maybe move the args so we need to consider them volatile,
- * especially if the gcc optimizer is working!!
- */
- purify(NIL,NIL);
-
- 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);
-#endif
/* Open the file: */
unlink(filename);
file = fopen(filename, "w");
SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0);
SetSymbolValue(EVAL_STACK_TOP, 0);
printf("done]\n");
-#if defined WANT_CGC && defined X86_CGC_ACTIVE_P
- SetSymbolValue(X86_CGC_ACTIVE_P, T);
-#endif
printf("[saving current Lisp image into %s:\n", filename);
putw(CORE_MAGIC, file);
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