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

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

diff --git a/src/lisp/ao_lisp_atom.c b/src/lisp/ao_lisp_atom.c
index efa4f6214705d78623e27ad01ba686c9bf1f0e9f..e1d9b0821949f5624ab3fd1eb40e9427a85eccf7 100644 (file)
--- a/src/lisp/ao_lisp_atom.c
+++ b/src/lisp/ao_lisp_atom.c
@@ -46,11 +46,19 @@ static void atom_mark(void *addr)
 static void atom_move(void *addr)
 {
        struct ao_lisp_atom     *atom = addr;
+       int                     ret;
 
        for (;;) {
-               if (ao_lisp_poly_move(&atom->next, 0))
+               struct ao_lisp_atom *next = ao_lisp_poly_atom(atom->next);
+
+               if (!next)
                        break;
-               atom = ao_lisp_poly_atom(atom->next);
+               ret = ao_lisp_move_memory((void **) &next, atom_size(next));
+               if (next != ao_lisp_poly_atom(atom->next))
+                       atom->next = ao_lisp_atom_poly(next);
+               if (ret)
+                       break;
+               atom = next;
        }
 }