projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: Simplify GC a bit by only marking the head of each object
[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 cd8a8d1d03b9920716fece9c834e101f3d70b55f..311d63ab8dc3dd0497f1edb3385d219eeda42e14 100644
(file)
--- a/
src/lisp/ao_lisp_cons.c
+++ b/
src/lisp/ao_lisp_cons.c
@@
-14,8
+14,6
@@
#include "ao_lisp.h"
#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;
static void cons_mark(void *addr)
{
struct ao_lisp_cons *cons = addr;
@@
-25,7
+23,7
@@
static void cons_mark(void *addr)
cons = ao_lisp_poly_cons(cons->cdr);
if (!cons)
break;
cons = ao_lisp_poly_cons(cons->cdr);
if (!cons)
break;
- if (ao_lisp_mark_memory(
cons, sizeof (struct ao_lisp_cons)
))
+ if (ao_lisp_mark_memory(
&ao_lisp_cons_type, cons
))
break;
}
}
break;
}
}
@@
-47,11
+45,17
@@
static void cons_move(void *addr)
struct ao_lisp_cons *cdr;
int ret;
struct ao_lisp_cons *cdr;
int ret;
+ MDBG_MOVE("cons_move start %d (%d, %d)\n",
+ MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
(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);
- ret = ao_lisp_move_memory((void **) &cdr, sizeof (struct ao_lisp_cons));
+ if (!cdr)
+ break;
+ ret = ao_lisp_move_memory(&ao_lisp_cons_type, (void **) &cdr);
if (cdr != ao_lisp_poly_cons(cons->cdr))
cons->cdr = ao_lisp_cons_poly(cdr);
if (cdr != ao_lisp_poly_cons(cons->cdr))
cons->cdr = ao_lisp_cons_poly(cdr);
+ MDBG_MOVE("cons_move end %d (%d, %d)\n",
+ MDBG_OFFSET(cons), MDBG_OFFSET(ao_lisp_ref(cons->car)), MDBG_OFFSET(ao_lisp_ref(cons->cdr)));
if (ret)
break;
cons = cdr;
if (ret)
break;
cons = cdr;
@@
-62,6
+66,7
@@
const struct ao_lisp_type ao_lisp_cons_type = {
.mark = cons_mark,
.size = cons_size,
.move = cons_move,
.mark = cons_mark,
.size = cons_size,
.move = cons_move,
+ .name = "cons",
};
struct ao_lisp_cons *
};
struct ao_lisp_cons *
@@
-69,11
+74,11
@@
ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr)
{
struct ao_lisp_cons *cons;
{
struct ao_lisp_cons *cons;
- ao_lisp_
root_add(&ao_lisp_cons_type, &cd
r);
- ao_lisp_
root_poly_add(&ca
r);
+ ao_lisp_
poly_stash(0, ca
r);
+ ao_lisp_
cons_stash(0, cd
r);
cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
-
ao_lisp_root_clear(&car
);
-
ao_lisp_root_clear(&cdr
);
+
car = ao_lisp_poly_fetch(0
);
+
cdr = ao_lisp_cons_fetch(0
);
if (!cons)
return NULL;
cons->car = car;
if (!cons)
return NULL;
cons->car = car;
@@
-107,3
+112,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;
+}