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

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

diff --git a/src/lisp/ao_lisp_eval.c b/src/lisp/ao_lisp_eval.c
index ae2436b8cd86d7026bde5b1bc7347abaced9ba00..1c9298691b273eb001bb38438e5792e5b9c4b2ed 100644 (file)
--- a/src/lisp/ao_lisp_eval.c
+++ b/src/lisp/ao_lisp_eval.c
@@ -32,6 +32,7 @@ stack_mark(void *addr)
                ao_lisp_poly_mark(stack->values, 0);
                /* no need to mark values_tail */
                ao_lisp_poly_mark(stack->frame, 0);
+               ao_lisp_poly_mark(stack->list, 0);
                stack = ao_lisp_poly_stack(stack->prev);
                if (ao_lisp_mark_memory(stack, sizeof (struct ao_lisp_stack)))
                        break;
@@ -47,12 +48,15 @@ stack_move(void *addr)
 
        while (stack) {
                struct ao_lisp_stack    *prev;
-               int     ret;
+               int                     ret;
                (void) ao_lisp_poly_move(&stack->sexprs, 0);
                (void) ao_lisp_poly_move(&stack->values, 0);
                (void) ao_lisp_poly_move(&stack->values_tail, 0);
                (void) ao_lisp_poly_move(&stack->frame, 0);
+               (void) ao_lisp_poly_move(&stack->list, 0);
                prev = ao_lisp_poly_stack(stack->prev);
+               if (!prev)
+                       break;
                ret = ao_lisp_move_memory((void **) &prev,
                                          sizeof (struct ao_lisp_stack));
                if (prev != ao_lisp_poly_stack(stack->prev))