altos/lisp: Make sure memmove only happens once per object. Other GC fixes

[fw/altos] / src / lisp / ao_lisp_cons.c

diff --git a/src/lisp/ao_lisp_cons.c b/src/lisp/ao_lisp_cons.c
index 60cbb2f35cd1ae5d95bcf1e3eed72e6eeb12cd0c..c7d8382f79d19c1d563516997fee1dce9b3dad18 100644 (file)
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -14,13 +14,15 @@
 
 #include "ao_lisp.h"
 
+#define OFFSET(a)      ((int) ((uint8_t *) (a) - ao_lisp_const))
+
 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)))
@@ -38,47 +40,92 @@ 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));
+               (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((void **) &cdr, sizeof (struct ao_lisp_cons));
+               if (cdr != ao_lisp_poly_cons(cons->cdr))
+                       cons->cdr = ao_lisp_cons_poly(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,
 };
 
+static ao_poly cons_car;
+static struct ao_lisp_cons *cons_cdr;
+static int been_here;
+
 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));
+       struct ao_lisp_cons     *cons;
+
+       if (!been_here) {
+               ao_lisp_root_add(&ao_lisp_cons_type, &cons_cdr);
+               ao_lisp_root_poly_add(&cons_car);
+               been_here = 1;
+       }
+       cons_car = car;
+       cons_cdr = cdr;
+       cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
        if (!cons)
                return NULL;
-       cons->car = car;
-       cons->cdr = cdr;
+       cons->car = cons_car;
+       cons->cdr = ao_lisp_cons_poly(cons_cdr);
+       cons_car = AO_LISP_NIL;
+       cons_cdr = NULL;
        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(")");
 }
+
+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;
+}