#include "ao_lisp.h"
-#if 0
-#define DBG(...) printf(__VA_ARGS__)
-#else
-#define DBG(...)
-#endif
-
static inline int
frame_num_size(int num)
{
return frame_num_size(frame->num);
}
-#define OFFSET(a) ((uint8_t *) (ao_lisp_ref(a)) - ao_lisp_const)
-
static void
frame_mark(void *addr)
{
int f;
for (;;) {
- if (frame->readonly)
+ MDBG_MOVE("frame mark %d\n", MDBG_OFFSET(frame));
+ if (!AO_LISP_IS_POOL(frame))
break;
for (f = 0; f < frame->num; f++) {
struct ao_lisp_val *v = &frame->vals[f];
- ao_lisp_poly_mark(v->atom);
- ao_lisp_poly_mark(v->val);
- DBG ("\tframe mark atom %s %d val %d at %d\n", ao_lisp_poly_atom(v->atom)->name, OFFSET(v->atom), OFFSET(v->val), f);
+ ao_lisp_poly_mark(v->val, 0);
+ MDBG_MOVE("frame mark atom %s %d val %d at %d\n",
+ ao_lisp_poly_atom(v->atom)->name,
+ MDBG_OFFSET(ao_lisp_ref(v->atom)),
+ MDBG_OFFSET(ao_lisp_ref(v->val)), f);
}
frame = ao_lisp_poly_frame(frame->next);
+ MDBG_MOVE("frame next %d\n", MDBG_OFFSET(frame));
if (!frame)
break;
- if (ao_lisp_mark_memory(frame, frame_size(frame)))
+ if (ao_lisp_mark_memory(&ao_lisp_frame_type, frame))
break;
}
}
for (;;) {
struct ao_lisp_frame *next;
- if (frame->readonly)
+ int ret;
+
+ MDBG_MOVE("frame move %d\n", MDBG_OFFSET(frame));
+ if (!AO_LISP_IS_POOL(frame))
break;
for (f = 0; f < frame->num; f++) {
struct ao_lisp_val *v = &frame->vals[f];
- ao_poly t;
-
- t = ao_lisp_poly_move(v->atom);
- DBG("\t\tatom %s %d -> %d\n", ao_lisp_poly_atom(t)->name, OFFSET(v->atom), OFFSET(t));
- v->atom = t;
- t = ao_lisp_poly_move(v->val);
- DBG("\t\tval %d -> %d\n", OFFSET(v->val), OFFSET(t));
- v->val = t;
+
+ ao_lisp_poly_move(&v->atom, 0);
+ ao_lisp_poly_move(&v->val, 0);
+ MDBG_MOVE("frame move atom %s %d val %d at %d\n",
+ ao_lisp_poly_atom(v->atom)->name,
+ MDBG_OFFSET(ao_lisp_ref(v->atom)),
+ MDBG_OFFSET(ao_lisp_ref(v->val)), f);
}
next = ao_lisp_poly_frame(frame->next);
if (!next)
break;
- next = ao_lisp_move_memory(next, frame_size(next));
- frame->next = ao_lisp_frame_poly(next);
+ ret = ao_lisp_move_memory(&ao_lisp_frame_type, (void **) &next);
+ if (next != ao_lisp_poly_frame(frame->next)) {
+ MDBG_MOVE("frame next moved from %d to %d\n",
+ MDBG_OFFSET(ao_lisp_poly_frame(frame->next)),
+ MDBG_OFFSET(next));
+ frame->next = ao_lisp_frame_poly(next);
+ }
+ if (ret)
+ break;
frame = next;
}
}
const struct ao_lisp_type ao_lisp_frame_type = {
.mark = frame_mark,
.size = frame_size,
- .move = frame_move
+ .move = frame_move,
+ .name = "frame",
};
+void
+ao_lisp_frame_print(ao_poly p)
+{
+ struct ao_lisp_frame *frame = ao_lisp_poly_frame(p);
+ int f;
+
+ printf ("{");
+ if (frame) {
+ for (f = 0; f < frame->num; f++) {
+ if (f != 0)
+ printf(", ");
+ ao_lisp_poly_print(frame->vals[f].atom);
+ printf(" = ");
+ ao_lisp_poly_print(frame->vals[f].val);
+ }
+ if (frame->next)
+ ao_lisp_poly_print(frame->next);
+ }
+ printf("}");
+}
+
ao_poly *
ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom)
{
ao_lisp_frame_set(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val)
{
while (frame) {
- if (!frame->readonly) {
+ if (!AO_LISP_IS_CONST(frame)) {
ao_poly *ref = ao_lisp_frame_ref(frame, atom);
if (ref) {
*ref = val;
}
struct ao_lisp_frame *
-ao_lisp_frame_new(int num, int readonly)
+ao_lisp_frame_new(int num)
{
struct ao_lisp_frame *frame = ao_lisp_alloc(frame_num_size(num));
if (!frame)
return NULL;
+ frame->type = AO_LISP_FRAME;
frame->num = num;
- frame->readonly = readonly;
frame->next = AO_LISP_NIL;
memset(frame->vals, '\0', num * sizeof (struct ao_lisp_val));
return frame;
}
static struct ao_lisp_frame *
-ao_lisp_frame_realloc(struct ao_lisp_frame *frame, int new_num, int readonly)
+ao_lisp_frame_realloc(struct ao_lisp_frame **frame_ref, int new_num)
{
+ struct ao_lisp_frame *frame = *frame_ref;
struct ao_lisp_frame *new;
int copy;
if (new_num == frame->num)
return frame;
- new = ao_lisp_frame_new(new_num, readonly);
+ new = ao_lisp_frame_new(new_num);
if (!new)
return NULL;
+ /*
+ * Re-fetch the frame as it may have moved
+ * during the allocation
+ */
+ frame = *frame_ref;
copy = new_num;
if (copy > frame->num)
copy = frame->num;
memcpy(new->vals, frame->vals, copy * sizeof (struct ao_lisp_val));
- if (frame)
- new->next = frame->next;
+ new->next = frame->next;
return new;
}
-struct ao_lisp_frame *
-ao_lisp_frame_add(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val)
+int
+ao_lisp_frame_add(struct ao_lisp_frame **frame_ref, ao_poly atom, ao_poly val)
{
+ struct ao_lisp_frame *frame = *frame_ref;
ao_poly *ref = frame ? ao_lisp_frame_ref(frame, atom) : NULL;
+
if (!ref) {
int f;
+ ao_lisp_poly_stash(0, atom);
+ ao_lisp_poly_stash(1, val);
if (frame) {
f = frame->num;
- frame = ao_lisp_frame_realloc(frame, f + 1, frame->readonly);
+ frame = ao_lisp_frame_realloc(frame_ref, f + 1);
} else {
f = 0;
- frame = ao_lisp_frame_new(1, 0);
+ frame = ao_lisp_frame_new(1);
}
+ atom = ao_lisp_poly_fetch(0);
+ val = ao_lisp_poly_fetch(1);
if (!frame)
- return NULL;
- DBG ("add atom %s %d, val %d at %d\n", ao_lisp_poly_atom(atom)->name, OFFSET(atom), OFFSET(val), f);
+ return 0;
+ *frame_ref = frame;
frame->vals[f].atom = atom;
ref = &frame->vals[f].val;
}
*ref = val;
- return frame;
+ return 1;
}
projects / fw / altos / blobdiff