X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_cons.c;h=d2b60c9a6561b06f1ec926d864d0c9934de951af;hb=97cf9df882291b9e494b2f64f84eb37357a6ab31;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..d2b60c9a 100644
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -19,11 +19,11 @@ static void cons_mark(void *addr)
 	struct ao_lisp_cons	*cons = addr;
 
 	for (;;) {
-		ao_lisp_poly_mark(cons->car);
-		cons = cons->cdr;
+		ao_lisp_poly_mark(cons->car, 1);
+		cons = ao_lisp_poly_cons(cons->cdr);
 		if (!cons)
 			break;
-		if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
+		if (ao_lisp_mark_memory(&ao_lisp_cons_type, cons))
 			break;
 	}
 }
@@ -38,47 +38,106 @@ static void cons_move(void *addr)
 {
 	struct ao_lisp_cons	*cons = addr;
 
+	if (!cons)
+		return;
+
 	for (;;) {
 		struct ao_lisp_cons	*cdr;
+		int			ret;
 
-		cons->car = ao_lisp_poly_move(cons->car);
-		cdr = ao_lisp_move_memory(cons->cdr, sizeof (struct ao_lisp_cons));
+		MDBG_MOVE("cons_move start %d (%d, %d)\n",
+			  MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
+		(void) ao_lisp_poly_move(&cons->car, 1);
+		cdr = ao_lisp_poly_cons(cons->cdr);
 		if (!cdr)
 			break;
-		cons->cdr = cdr;
+		ret = ao_lisp_move_memory(&ao_lisp_cons_type, (void **) &cdr);
+		if (cdr != ao_lisp_poly_cons(cons->cdr))
+			cons->cdr = ao_lisp_cons_poly(cdr);
+		MDBG_MOVE("cons_move end %d (%d, %d)\n",
+			  MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
+		if (ret)
+			break;
 		cons = cdr;
 	}
 }
 
-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,
+	.name = "cons",
 };
 
+struct ao_lisp_cons *ao_lisp_cons_free_list;
+
 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;
+	struct ao_lisp_cons	*cons;
+
+	if (ao_lisp_cons_free_list) {
+		cons = ao_lisp_cons_free_list;
+		ao_lisp_cons_free_list = ao_lisp_poly_cons(cons->cdr);
+	} else {
+		ao_lisp_poly_stash(0, car);
+		ao_lisp_cons_stash(0, cdr);
+		cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
+		car = ao_lisp_poly_fetch(0);
+		cdr = ao_lisp_cons_fetch(0);
+		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_free(struct ao_lisp_cons *cons)
+{
+	while (cons) {
+		ao_poly cdr = cons->cdr;
+		cons->cdr = ao_lisp_cons_poly(ao_lisp_cons_free_list);
+		ao_lisp_cons_free_list = cons;
+		cons = ao_lisp_poly_cons(cdr);
+	}
+}
+
+void
+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(")");
 }
+
+void
+ao_lisp_cons_patom(ao_poly c)
+{
+	struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
+
+	while (cons) {
+		ao_lisp_poly_patom(cons->car);
+		cons = ao_lisp_poly_cons(cons->cdr);
+	}
+}
+
+int
+ao_lisp_cons_length(struct ao_lisp_cons *cons)
+{
+	int	len = 0;
+	while (cons) {
+		len++;
+		cons = ao_lisp_poly_cons(cons->cdr);
+	}
+	return len;
+}