altos/lisp: convert GC to non-recursive

[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 65908e30a610ea0f2b706eb17e314a9db1b2866d..855079b8b483022040a5124bef3b4ea0c77cf09e 100644 (file)
--- a/src/lisp/ao_lisp_cons.c
+++ b/src/lisp/ao_lisp_cons.c
@@ -14,12 +14,14 @@
 
 #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);
+               ao_lisp_poly_mark(cons->car, 1);
                cons = ao_lisp_poly_cons(cons->cdr);
                if (!cons)
                        break;
@@ -38,15 +40,20 @@ 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);
+               (void) ao_lisp_poly_move(&cons->car, 1);
                cdr = ao_lisp_poly_cons(cons->cdr);
-               cdr = ao_lisp_move_memory(cdr, sizeof (struct ao_lisp_cons));
-               if (!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 = ao_lisp_cons_poly(cdr);
                cons = cdr;
        }
 }
@@ -83,3 +90,14 @@ ao_lisp_cons_print(ao_poly c)
        }
        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);
+       }
+}