X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_save.c;h=4f850fb992ce5db1fd1aba720aef4109d1c819f1;hb=6fb817f218a69b28973b0d059d71809717b1e2d1;hp=2b19fdcba3520ba182b85799e1c1ea72d9e5cb6b;hpb=dba374516ed396633659dec571b6a44b03da8ad1;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_save.c b/src/lisp/ao_lisp_save.c
index 2b19fdcb..4f850fb9 100644
--- a/src/lisp/ao_lisp_save.c
+++ b/src/lisp/ao_lisp_save.c
@@ -17,12 +17,18 @@
 ao_poly
 ao_lisp_save(struct ao_lisp_cons *cons)
 {
+	if (!ao_lisp_check_argc(_ao_lisp_atom_save, cons, 0, 0))
+		return AO_LISP_NIL;
+
 #ifdef AO_LISP_SAVE
-	struct ao_lisp_os_save *os = (struct ao_lisp_os_save *) &ao_lisp_pool[AO_LISP_POOL];
+	struct ao_lisp_os_save *os = (struct ao_lisp_os_save *) (void *) &ao_lisp_pool[AO_LISP_POOL];
+
+	ao_lisp_collect(AO_LISP_COLLECT_FULL);
+	os->atoms = ao_lisp_atom_poly(ao_lisp_atoms);
+	os->globals = ao_lisp_frame_poly(ao_lisp_frame_global);
+	os->const_checksum = ao_lisp_const_checksum;
+	os->const_checksum_inv = (uint16_t) ~ao_lisp_const_checksum;
 
-	ao_lisp_collect();
-	os->ao_lisp_atoms = ao_lisp_atom_poly(ao_lisp_atoms);
-	os->ao_lisp_globals = ao_lisp_frame_poly(ao_lisp_frame_global);
 	if (ao_lisp_os_save())
 		return _ao_lisp_atom_t;
 #endif
@@ -32,20 +38,33 @@ ao_lisp_save(struct ao_lisp_cons *cons)
 ao_poly
 ao_lisp_restore(struct ao_lisp_cons *cons)
 {
+	if (!ao_lisp_check_argc(_ao_lisp_atom_save, cons, 0, 0))
+		return AO_LISP_NIL;
+
 #ifdef AO_LISP_SAVE
-	struct ao_lisp_os_save *os = (struct ao_lisp_os_save *) &ao_lisp_pool[AO_LISP_POOL];
+	struct ao_lisp_os_save save;
+	struct ao_lisp_os_save *os = (struct ao_lisp_os_save *) (void *) &ao_lisp_pool[AO_LISP_POOL];
+
+	if (!ao_lisp_os_restore_save(&save, AO_LISP_POOL))
+		return ao_lisp_error(AO_LISP_INVALID, "header restore failed");
+
+	if (save.const_checksum != ao_lisp_const_checksum ||
+	    save.const_checksum_inv != (uint16_t) ~ao_lisp_const_checksum)
+	{
+		return ao_lisp_error(AO_LISP_INVALID, "image is corrupted or stale");
+	}
 
 	if (ao_lisp_os_restore()) {
 
-		ao_lisp_atoms = ao_lisp_poly_atom(os->ao_lisp_atoms);
-		ao_lisp_frame_global = ao_lisp_poly_frame(os->ao_lisp_globals);
+		ao_lisp_atoms = ao_lisp_poly_atom(os->atoms);
+		ao_lisp_frame_global = ao_lisp_poly_frame(os->globals);
 
 		/* Clear the eval global variabls */
 		ao_lisp_eval_clear_globals();
 
 		/* Reset the allocator */
 		ao_lisp_top = AO_LISP_POOL;
-		ao_lisp_collect();
+		ao_lisp_collect(AO_LISP_COLLECT_FULL);
 
 		/* Re-create the evaluator stack */
 		if (!ao_lisp_eval_restart())