* files for more information.
*/
+#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <signal.h>
#include <sys/file.h>
+#include "sbcl.h"
#include "runtime.h"
#include "os.h"
-#include "sbcl.h"
#include "core.h"
#include "globals.h"
#include "save.h"
#include "dynbind.h"
#include "lispregs.h"
#include "validate.h"
+#include "gc-internal.h"
+#include "thread.h"
-#ifdef GENCGC
-#include "gencgc.h"
-#endif
+#include "genesis/static-symbols.h"
+#include "genesis/symbol.h"
+
+static void
+write_lispobj(lispobj obj, FILE *file)
+{
+ fwrite(&obj, sizeof(lispobj), 1, file);
+}
static long
write_bytes(FILE *file, char *addr, long bytes)
int words, bytes, data;
static char *names[] = {NULL, "dynamic", "static", "read-only"};
- putw(id, file);
+ write_lispobj(id, file);
words = end - addr;
- putw(words, file);
+ write_lispobj(words, file);
bytes = words * sizeof(lispobj);
data = write_bytes(file, (char *)addr, bytes);
- putw(data, file);
- putw((long)addr / os_vm_page_size, file);
- putw((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
+ write_lispobj(data, file);
+ write_lispobj((long)addr / os_vm_page_size, file);
+ write_lispobj((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: */
+ struct thread *th;
+
+ /* Open the output file. We don't actually need the file yet, but
+ * the fopen() might fail for some reason, and we want to detect
+ * that and back out before we do anything irreversible. */
unlink(filename);
file = fopen(filename, "w");
- if (file == NULL) {
+ if (!file) {
perror(filename);
return 1;
}
- printf("[undoing binding stack... ");
+
+ /* Smash the enclosing state. (Once we do this, there's no good
+ * way to go back, which is a sufficient reason that this ends up
+ * being SAVE-LISP-AND-DIE instead of SAVE-LISP-AND-GO-ON). */
+ printf("[undoing binding stack and other enclosing state... ");
fflush(stdout);
- unbind_to_here((lispobj *)BINDING_STACK_START);
- SetSymbolValue(CURRENT_CATCH_BLOCK, 0);
- SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0);
- SetSymbolValue(EVAL_STACK_TOP, 0);
+ for_each_thread(th) { /* XXX really? */
+ unbind_to_here((lispobj *)th->binding_stack_start,th);
+ SetSymbolValue(CURRENT_CATCH_BLOCK, 0,th);
+ SetSymbolValue(CURRENT_UNWIND_PROTECT_BLOCK, 0,th);
+ }
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);
+ fflush(stdout);
+
+ /* (Now we can actually start copying ourselves into the output file.) */
- putw(CORE_VERSION, file);
- putw(3, file);
- putw(SBCL_CORE_VERSION_INTEGER, file);
+ printf("[saving current Lisp image into %s:\n", filename);
+ fflush(stdout);
- putw(CORE_NDIRECTORY, file);
- putw((5*3)+2, file);
+ write_lispobj(CORE_MAGIC, file);
+
+ write_lispobj(VERSION_CORE_ENTRY_TYPE_CODE, file);
+ write_lispobj(3, file);
+ write_lispobj(SBCL_CORE_VERSION_INTEGER, file);
+
+ write_lispobj(BUILD_ID_CORE_ENTRY_TYPE_CODE, file);
+ write_lispobj(/* (We're writing the word count of the entry here, and the 2
+ * term is one word for the leading BUILD_ID_CORE_ENTRY_TYPE_CODE
+ * word and one word where we store the count itself.) */
+ 2 + strlen(build_id),
+ file);
+ {
+ char *p;
+ for (p = build_id; *p; ++p)
+ write_lispobj(*p, file);
+ }
- 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));
+ write_lispobj(NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE, file);
+ write_lispobj(/* (word count = 3 spaces described by 5 words each, plus the
+ * entry type code, plus this count itself) */
+ (5*3)+2, file);
+ output_space(file,
+ READ_ONLY_CORE_SPACE_ID,
+ (lispobj *)READ_ONLY_SPACE_START,
+ (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER,0));
+ output_space(file,
+ STATIC_CORE_SPACE_ID,
+ (lispobj *)STATIC_SPACE_START,
+ (lispobj *)SymbolValue(STATIC_SPACE_FREE_POINTER,0));
#ifdef reg_ALLOC
- output_space(file, DYNAMIC_SPACE_ID, (lispobj *)current_dynamic_space,
+ output_space(file,
+ DYNAMIC_CORE_SPACE_ID,
+ (lispobj *)current_dynamic_space,
dynamic_space_free_pointer);
#else
-#ifdef GENCGC
- /* Flush the current_region updating the tables. */
- gc_alloc_update_page_tables(0,&boxed_region);
- gc_alloc_update_page_tables(1,&unboxed_region);
+#ifdef LISP_FEATURE_GENCGC
+ /* Flush the current_region, updating the tables. */
+ gc_alloc_update_all_page_tables();
update_x86_dynamic_space_free_pointer();
#endif
- output_space(file, DYNAMIC_SPACE_ID, (lispobj *)DYNAMIC_SPACE_START,
- (lispobj *)SymbolValue(ALLOCATION_POINTER));
+ output_space(file,
+ DYNAMIC_CORE_SPACE_ID,
+ (lispobj *)DYNAMIC_SPACE_START,
+ (lispobj *)SymbolValue(ALLOCATION_POINTER,0));
#endif
- putw(CORE_INITIAL_FUNCTION, file);
- putw(3, file);
- putw(init_function, file);
+ write_lispobj(INITIAL_FUN_CORE_ENTRY_TYPE_CODE, file);
+ write_lispobj(3, file);
+ write_lispobj(init_function, file);
- putw(CORE_END, file);
- fclose(file);
+ write_lispobj(END_CORE_ENTRY_TYPE_CODE, file);
+ fclose(file);
printf("done]\n");
exit(0);
projects / sbcl.git / blobdiff