X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=f8a34ed4914a1e0073116f964bd08b7c47f0ccad;hb=77db0e8162cd01c2b42737b3d71b38cea942484f;hp=60cbb2f35cd1ae5d95bcf1e3eed72e6eeb12cd0c;hpb=56d46ceaa1413415f25e47e81036426132f99924;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 60cbb2f3..f8a34ed4 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -14,13 +14,30 @@
 
 #include "ao_lisp.h"
 
+#define OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_const))
+
+#if 0
+static int cons_depth;
+#define DBG(...)	do { int d; for (d = 0; d < cons_depth; d++) printf ("  "); printf(__VA_ARGS__); } while(0)
+#define DBG_IN()	(cons_depth++)
+#define DBG_OUT()	(cons_depth--)
+#define DBG_PR(c)	ao_lisp_cons_print(ao_lisp_cons_poly(c))
+#define DBG_PRP(p)	ao_lisp_poly_print(p)
+#else
+#define DBG(...)
+#define DBG_IN()
+#define DBG_OUT()
+#define DBG_PR(c)
+#define DBG_PRP(p)
+#endif
+
 static void cons_mark(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
 	for (;;) {
 		ao_lisp_poly_mark(cons->car);
-		cons = cons->cdr;
+		cons = ao_lisp_poly_cons(cons->cdr);
 		if (!cons)
 			break;
 		if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
@@ -38,46 +55,55 @@ static void cons_move(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
+	DBG_IN();
+	DBG("move cons start %d\n", OFFSET(cons));
 	for (;;) {
 		struct ao_lisp_cons	*cdr;
+		ao_poly			car;
 
-		cons->car = ao_lisp_poly_move(cons->car);
-		cdr = ao_lisp_move_memory(cons->cdr, sizeof (struct ao_lisp_cons));
+		car = ao_lisp_poly_move(cons->car);
+		DBG(" moved car %d -> %d\n", OFFSET(ao_lisp_ref(cons->car)), OFFSET(ao_lisp_ref(car)));
+		cons->car = car;
+		cdr = ao_lisp_poly_cons(cons->cdr);
+		cdr = ao_lisp_move_memory(cdr, sizeof (struct ao_lisp_cons));
 		if (!cdr)
 			break;
-		cons->cdr = cdr;
+		DBG(" moved cdr %d -> %d\n", OFFSET(ao_lisp_poly_cons(cons->cdr)), OFFSET(cdr));
+		cons->cdr = ao_lisp_cons_poly(cdr);
 		cons = cdr;
 	}
+	DBG("move cons end\n");
+	DBG_OUT();
 }
 
-const struct ao_lisp_mem_type ao_lisp_cons_type = {
+const struct ao_lisp_type ao_lisp_cons_type = {
 	.mark = cons_mark,
 	.size = cons_size,
 	.move = cons_move,
 };
 
 struct ao_lisp_cons *
-ao_lisp_cons(ao_lisp_poly car, struct ao_lisp_cons *cdr)
+ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr)
 {
 	struct ao_lisp_cons	*cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
 	if (!cons)
 		return NULL;
 	cons->car = car;
-	cons->cdr = cdr;
+	cons->cdr = ao_lisp_cons_poly(cdr);
 	return cons;
 }
 
 void
-ao_lisp_cons_print(struct ao_lisp_cons *cons)
+ao_lisp_cons_print(ao_poly c)
 {
+	struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
 	int	first = 1;
 	printf("(");
 	while (cons) {
 		if (!first)
 			printf(" ");
-		fflush(stdout);
 		ao_lisp_poly_print(cons->car);
-		cons = cons->cdr;
+		cons = ao_lisp_poly_cons(cons->cdr);
 		first = 0;
 	}
 	printf(")");