X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme_frame.c;h=3f4c91570548b79607f7d30d88ae78b98166aad7;hb=e1a6b3bf458f311d832aea7eec34935d42f8efed;hp=e5d481e75d3e5b25068346d11959b0f3a5856c17;hpb=2f8fce1cf6ce4bd12a836cc8ee15f4edbc95c95e;p=fw%2Faltos

diff --git a/src/scheme/ao_scheme_frame.c b/src/scheme/ao_scheme_frame.c
index e5d481e7..3f4c9157 100644
--- a/src/scheme/ao_scheme_frame.c
+++ b/src/scheme/ao_scheme_frame.c
@@ -41,7 +41,6 @@ frame_vals_mark(void *addr)
 			  ao_scheme_poly_atom(v->atom)->name,
 			  MDBG_OFFSET(ao_scheme_ref(v->atom)),
 			  MDBG_OFFSET(ao_scheme_ref(v->val)), f);
-		MDBG_DO(ao_scheme_poly_write(v->val));
 		MDBG_DO(printf("\n"));
 	}
 }
@@ -84,10 +83,13 @@ frame_mark(void *addr)
 	struct ao_scheme_frame	*frame = addr;
 
 	for (;;) {
+		struct ao_scheme_frame_vals	*vals = ao_scheme_poly_frame_vals(frame->vals);
+
 		MDBG_MOVE("frame mark %d\n", MDBG_OFFSET(frame));
 		if (!AO_SCHEME_IS_POOL(frame))
 			break;
-		ao_scheme_poly_mark(frame->vals, 0);
+		if (!ao_scheme_mark_memory(&ao_scheme_frame_vals_type, vals))
+			frame_vals_mark(vals);
 		frame = ao_scheme_poly_frame(frame->prev);
 		MDBG_MOVE("frame next %d\n", MDBG_OFFSET(frame));
 		if (!frame)
@@ -103,13 +105,20 @@ frame_move(void *addr)
 	struct ao_scheme_frame	*frame = addr;
 
 	for (;;) {
-		struct ao_scheme_frame	*prev;
-		int			ret;
+		struct ao_scheme_frame		*prev;
+		struct ao_scheme_frame_vals	*vals;
+		int				ret;
 
 		MDBG_MOVE("frame move %d\n", MDBG_OFFSET(frame));
 		if (!AO_SCHEME_IS_POOL(frame))
 			break;
-		ao_scheme_poly_move(&frame->vals, 0);
+
+		vals = ao_scheme_poly_frame_vals(frame->vals);
+		if (!ao_scheme_move_memory(&ao_scheme_frame_vals_type, (void **) &vals))
+			frame_vals_move(vals);
+		if (vals != ao_scheme_poly_frame_vals(frame->vals))
+			frame->vals = ao_scheme_frame_vals_poly(vals);
+
 		prev = ao_scheme_poly_frame(frame->prev);
 		if (!prev)
 			break;