projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 855079b8b483022040a5124bef3b4ea0c77cf09e..c7d8382f79d19c1d563516997fee1dce9b3dad18 100644
(file)
--- a/
src/lisp/ao_lisp_cons.c
+++ b/
src/lisp/ao_lisp_cons.c
@@
-49,6
+49,8
@@
static void cons_move(void *addr)
(void) ao_lisp_poly_move(&cons->car, 1);
cdr = ao_lisp_poly_cons(cons->cdr);
(void) ao_lisp_poly_move(&cons->car, 1);
cdr = ao_lisp_poly_cons(cons->cdr);
+ if (!cdr)
+ break;
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);
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);
@@
-64,14
+66,29
@@
const struct ao_lisp_type ao_lisp_cons_type = {
.move = cons_move,
};
.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_cons(ao_poly car, struct ao_lisp_cons *cdr)
{
struct ao_lisp_cons *
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;
if (!cons)
return NULL;
- cons->car = car;
- cons->cdr = ao_lisp_cons_poly(cdr);
+ cons->car = cons_car;
+ cons->cdr = ao_lisp_cons_poly(cons_cdr);
+ cons_car = AO_LISP_NIL;
+ cons_cdr = NULL;
return cons;
}
return cons;
}
@@
-101,3
+118,14
@@
ao_lisp_cons_patom(ao_poly c)
cons = ao_lisp_poly_cons(cons->cdr);
}
}
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;
+}