projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lisp: more GC issues. add patom
[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 60cbb2f35cd1ae5d95bcf1e3eed72e6eeb12cd0c..7d3ca68d6a7134914459791faaf283359264345a 100644
(file)
--- a/
src/lisp/ao_lisp_cons.c
+++ b/
src/lisp/ao_lisp_cons.c
@@
-14,13
+14,15
@@
#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;
for (;;) {
ao_lisp_poly_mark(cons->car);
static void cons_mark(void *addr)
{
struct ao_lisp_cons *cons = addr;
for (;;) {
ao_lisp_poly_mark(cons->car);
- cons =
cons->cdr
;
+ cons =
ao_lisp_poly_cons(cons->cdr)
;
if (!cons)
break;
if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
if (!cons)
break;
if (ao_lisp_mark_memory(cons, sizeof (struct ao_lisp_cons)))
@@
-38,47
+40,57
@@
static void cons_move(void *addr)
{
struct ao_lisp_cons *cons = addr;
{
struct ao_lisp_cons *cons = addr;
- for (;;) {
-
struct ao_lisp_cons *cdr
;
+ if (!cons)
+
return
;
- cons->car = ao_lisp_poly_move(cons->car);
-
cdr = ao_lisp_move_memory(cons->cdr, sizeof (struct ao_lisp_cons)
);
- if (
!cdr
)
+ for (;;) {
+
(void) ao_lisp_poly_move(&cons->car
);
+ if (
ao_lisp_poly_move(&cons->cdr)
)
break;
break;
- cons->cdr = cdr;
- cons = cdr;
+ cons = ao_lisp_poly_cons(cons->cdr);
}
}
}
}
-const struct ao_lisp_
mem_
type ao_lisp_cons_type = {
+const struct ao_lisp_type ao_lisp_cons_type = {
.mark = cons_mark,
.size = cons_size,
.move = cons_move,
};
struct ao_lisp_cons *
.mark = cons_mark,
.size = cons_size,
.move = cons_move,
};
struct ao_lisp_cons *
-ao_lisp_cons
(ao_lisp
_poly car, struct ao_lisp_cons *cdr)
+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));
if (!cons)
return NULL;
cons->car = car;
{
struct ao_lisp_cons *cons = ao_lisp_alloc(sizeof (struct ao_lisp_cons));
if (!cons)
return NULL;
cons->car = car;
- cons->cdr =
cdr
;
+ cons->cdr =
ao_lisp_cons_poly(cdr)
;
return cons;
}
void
return cons;
}
void
-ao_lisp_cons_print(
struct ao_lisp_cons *cons
)
+ao_lisp_cons_print(
ao_poly c
)
{
{
+ struct ao_lisp_cons *cons = ao_lisp_poly_cons(c);
int first = 1;
printf("(");
while (cons) {
if (!first)
printf(" ");
int first = 1;
printf("(");
while (cons) {
if (!first)
printf(" ");
- fflush(stdout);
ao_lisp_poly_print(cons->car);
ao_lisp_poly_print(cons->car);
- cons =
cons->cdr
;
+ cons =
ao_lisp_poly_cons(cons->cdr)
;
first = 0;
}
printf(")");
}
first = 0;
}
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);
+ }
+}