X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_frame.c;h=052d27d7246f83228de8c9a9d5785cc39eced6de;hb=daa06c8dedc6dc1cf21936ee2769d9d25f0567bd;hp=90344719afedc7881e5687cbc635a290f19acf7b;hpb=7da6bfc195fad97e3afc576c609897c131fd4d8c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_frame.c b/src/lisp/ao_lisp_frame.c
index 90344719..052d27d7 100644
--- a/src/lisp/ao_lisp_frame.c
+++ b/src/lisp/ao_lisp_frame.c
@@ -14,12 +14,6 @@
 
 #include "ao_lisp.h"
 
-#if 0
-#define DBG(...)	printf(__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
 static inline int
 frame_num_size(int num)
 {
@@ -30,11 +24,9 @@ static int
 frame_size(void *addr)
 {
 	struct ao_lisp_frame	*frame = addr;
-	return frame_num_size(frame->num);
+	return frame_num_size(ao_lisp_frame_num(frame));
 }
 
-#define OFFSET(a)	((int) ((uint8_t *) (ao_lisp_ref(a)) - ao_lisp_const))
-
 static void
 frame_mark(void *addr)
 {
@@ -42,22 +34,23 @@ frame_mark(void *addr)
 	int			f;
 
 	for (;;) {
-		DBG("frame mark %p\n", frame);
+		MDBG_MOVE("frame mark %d\n", MDBG_OFFSET(frame));
 		if (!AO_LISP_IS_POOL(frame))
 			break;
-		for (f = 0; f < frame->num; f++) {
+		for (f = 0; f < ao_lisp_frame_num(frame); f++) {
 			struct ao_lisp_val	*v = &frame->vals[f];
 
 			ao_lisp_poly_mark(v->val, 0);
-			DBG ("\tframe mark atom %s %d val %d at %d\n",
-			     ao_lisp_poly_atom(v->atom)->name,
-			     OFFSET(v->atom), OFFSET(v->val), f);
+			MDBG_MOVE("frame mark atom %s %d val %d at %d\n",
+				  ao_lisp_poly_atom(v->atom)->name,
+				  MDBG_OFFSET(ao_lisp_ref(v->atom)),
+				  MDBG_OFFSET(ao_lisp_ref(v->val)), f);
 		}
-		frame = ao_lisp_poly_frame(frame->next);
-		DBG("frame next %p\n", frame);
+		frame = ao_lisp_poly_frame(frame->prev);
+		MDBG_MOVE("frame next %d\n", MDBG_OFFSET(frame));
 		if (!frame)
 			break;
-		if (ao_lisp_mark_memory(frame, frame_size(frame)))
+		if (ao_lisp_mark_memory(&ao_lisp_frame_type, frame))
 			break;
 	}
 }
@@ -69,35 +62,43 @@ frame_move(void *addr)
 	int			f;
 
 	for (;;) {
-		struct ao_lisp_frame	*next;
+		struct ao_lisp_frame	*prev;
 		int			ret;
 
-		DBG("frame move %p\n", frame);
+		MDBG_MOVE("frame move %d\n", MDBG_OFFSET(frame));
 		if (!AO_LISP_IS_POOL(frame))
 			break;
-		for (f = 0; f < frame->num; f++) {
+		for (f = 0; f < ao_lisp_frame_num(frame); f++) {
 			struct ao_lisp_val	*v = &frame->vals[f];
 
 			ao_lisp_poly_move(&v->atom, 0);
-			DBG("moved atom %s\n", ao_lisp_poly_atom(v->atom)->name);
 			ao_lisp_poly_move(&v->val, 0);
+			MDBG_MOVE("frame move atom %s %d val %d at %d\n",
+				  ao_lisp_poly_atom(v->atom)->name,
+				  MDBG_OFFSET(ao_lisp_ref(v->atom)),
+				  MDBG_OFFSET(ao_lisp_ref(v->val)), f);
+		}
+		prev = ao_lisp_poly_frame(frame->prev);
+		if (!prev)
+			break;
+		ret = ao_lisp_move_memory(&ao_lisp_frame_type, (void **) &prev);
+		if (prev != ao_lisp_poly_frame(frame->prev)) {
+			MDBG_MOVE("frame prev moved from %d to %d\n",
+				  MDBG_OFFSET(ao_lisp_poly_frame(frame->prev)),
+				  MDBG_OFFSET(prev));
+			frame->prev = ao_lisp_frame_poly(prev);
 		}
-		next = ao_lisp_poly_frame(frame->next);
-		ret = 1;
-		if (next)
-			ret = ao_lisp_move_memory((void **) &next, frame_size(next));
-		if (next != ao_lisp_poly_frame(frame->next))
-			frame->next = ao_lisp_frame_poly(next);
 		if (ret)
 			break;
-		frame = next;
+		frame = prev;
 	}
 }
 
 const struct ao_lisp_type ao_lisp_frame_type = {
 	.mark = frame_mark,
 	.size = frame_size,
-	.move = frame_move
+	.move = frame_move,
+	.name = "frame",
 };
 
 void
@@ -108,15 +109,15 @@ ao_lisp_frame_print(ao_poly p)
 
 	printf ("{");
 	if (frame) {
-		for (f = 0; f < frame->num; f++) {
+		for (f = 0; f < ao_lisp_frame_num(frame); f++) {
 			if (f != 0)
 				printf(", ");
 			ao_lisp_poly_print(frame->vals[f].atom);
 			printf(" = ");
 			ao_lisp_poly_print(frame->vals[f].val);
 		}
-		if (frame->next)
-			ao_lisp_poly_print(frame->next);
+		if (frame->prev)
+			ao_lisp_poly_print(frame->prev);
 	}
 	printf("}");
 }
@@ -125,7 +126,7 @@ ao_poly *
 ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom)
 {
 	int f;
-	for (f = 0; f < frame->num; f++)
+	for (f = 0; f < ao_lisp_frame_num(frame); f++)
 		if (frame->vals[f].atom == atom)
 			return &frame->vals[f].val;
 	return NULL;
@@ -142,7 +143,7 @@ ao_lisp_frame_set(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val)
 				return 1;
 			}
 		}
-		frame = ao_lisp_poly_frame(frame->next);
+		frame = ao_lisp_poly_frame(frame->prev);
 	}
 	return 0;
 }
@@ -154,25 +155,55 @@ ao_lisp_frame_get(struct ao_lisp_frame *frame, ao_poly atom)
 		ao_poly *ref = ao_lisp_frame_ref(frame, atom);
 		if (ref)
 			return *ref;
-		frame = ao_lisp_poly_frame(frame->next);
+		frame = ao_lisp_poly_frame(frame->prev);
 	}
 	return AO_LISP_NIL;
 }
 
+struct ao_lisp_frame	*ao_lisp_frame_free_list[AO_LISP_FRAME_FREE];
+
 struct ao_lisp_frame *
 ao_lisp_frame_new(int num)
 {
-	struct ao_lisp_frame *frame = ao_lisp_alloc(frame_num_size(num));
+	struct ao_lisp_frame	*frame;
 
-	if (!frame)
-		return NULL;
+	if (num < AO_LISP_FRAME_FREE && (frame = ao_lisp_frame_free_list[num]))
+		ao_lisp_frame_free_list[num] = ao_lisp_poly_frame(frame->prev);
+	else {
+		frame = ao_lisp_alloc(frame_num_size(num));
+		if (!frame)
+			return NULL;
+	}
 	frame->type = AO_LISP_FRAME;
-	frame->num = num;
-	frame->next = AO_LISP_NIL;
+	frame->_num = num;
+	frame->prev = AO_LISP_NIL;
 	memset(frame->vals, '\0', num * sizeof (struct ao_lisp_val));
 	return frame;
 }
 
+ao_poly
+ao_lisp_frame_mark(struct ao_lisp_frame *frame)
+{
+	if (!frame)
+		return AO_LISP_NIL;
+	if (frame->_num == 0xff)
+		ao_lisp_abort();
+	frame->_num |= AO_LISP_FRAME_MARK;
+	return ao_lisp_frame_poly(frame);
+}
+
+void
+ao_lisp_frame_free(struct ao_lisp_frame *frame)
+{
+	if (!ao_lisp_frame_marked(frame)) {
+		int	num = ao_lisp_frame_num(frame);
+		if (num < AO_LISP_FRAME_FREE) {
+			frame->prev = ao_lisp_frame_poly(ao_lisp_frame_free_list[num]);
+			ao_lisp_frame_free_list[num] = frame;
+		}
+	}
+}
+
 static struct ao_lisp_frame *
 ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
 {
@@ -180,7 +211,7 @@ ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
 	struct ao_lisp_frame	*new;
 	int			copy;
 
-	if (new_num == frame->num)
+	if (new_num == ao_lisp_frame_num(frame))
 		return frame;
 	new = ao_lisp_frame_new(new_num);
 	if (!new)
@@ -191,10 +222,11 @@ ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
 	 */
 	frame = *frame_ref;
 	copy = new_num;
-	if (copy > frame->num)
-		copy = frame->num;
+	if (copy > ao_lisp_frame_num(frame))
+		copy = ao_lisp_frame_num(frame);
 	memcpy(new->vals, frame->vals, copy * sizeof (struct ao_lisp_val));
-	new->next = frame->next;
+	new->prev = frame->prev;
+	ao_lisp_frame_free(frame);
 	return new;
 }
 
@@ -206,21 +238,20 @@ ao_lisp_frame_add(struct ao_lisp_frame **frame_ref, ao_poly atom, ao_poly val)
 
 	if (!ref) {
 		int f;
-		ao_lisp_root_poly_add(&atom);
-		ao_lisp_root_poly_add(&val);
+		ao_lisp_poly_stash(0, atom);
+		ao_lisp_poly_stash(1, val);
 		if (frame) {
-			f = frame->num;
+			f = ao_lisp_frame_num(frame);
 			frame = ao_lisp_frame_realloc(frame_ref, f + 1);
 		} else {
 			f = 0;
 			frame = ao_lisp_frame_new(1);
 		}
-		ao_lisp_root_clear(&atom);
-		ao_lisp_root_clear(&val);
+		atom = ao_lisp_poly_fetch(0);
+		val = ao_lisp_poly_fetch(1);
 		if (!frame)
 			return 0;
 		*frame_ref = frame;
-		DBG ("add atom %s %d, val %d at %d\n", ao_lisp_poly_atom(atom)->name, OFFSET(atom), OFFSET(val), f);
 		frame->vals[f].atom = atom;
 		ref = &frame->vals[f].val;
 	}