void **addr;
};
-static struct ao_scheme_cons *save_cons[2];
-static struct ao_scheme_string *save_string[2];
-static struct ao_scheme_frame *save_frame[1];
-static ao_poly save_poly[3];
+#define AO_SCHEME_NUM_STASH 6
+static ao_poly stash_poly[AO_SCHEME_NUM_STASH];
+static int stash_poly_ptr;
static const struct ao_scheme_root ao_scheme_root[] = {
{
- .type = &ao_scheme_cons_type,
- .addr = (void **) &save_cons[0],
- },
- {
- .type = &ao_scheme_cons_type,
- .addr = (void **) &save_cons[1],
- },
- {
- .type = &ao_scheme_string_type,
- .addr = (void **) &save_string[0],
- },
- {
- .type = &ao_scheme_string_type,
- .addr = (void **) &save_string[1],
+ .type = NULL,
+ .addr = (void **) (void *) &stash_poly[0]
},
{
- .type = &ao_scheme_frame_type,
- .addr = (void **) &save_frame[0],
+ .type = NULL,
+ .addr = (void **) (void *) &stash_poly[1]
},
{
.type = NULL,
- .addr = (void **) (void *) &save_poly[0]
+ .addr = (void **) (void *) &stash_poly[2]
},
{
.type = NULL,
- .addr = (void **) (void *) &save_poly[1]
+ .addr = (void **) (void *) &stash_poly[3]
},
{
.type = NULL,
- .addr = (void **) (void *) &save_poly[2]
+ .addr = (void **) (void *) &stash_poly[4]
},
{
- .type = &ao_scheme_atom_type,
- .addr = (void **) &ao_scheme_atoms
+ .type = NULL,
+ .addr = (void **) (void *) &stash_poly[5]
},
{
.type = &ao_scheme_frame_type,
.type = &ao_scheme_cons_type,
.addr = (void **) &ao_scheme_read_stack,
},
+#ifdef AO_SCHEME_FEATURE_PORT
+ {
+ .type = NULL,
+ .addr = (void **) (void *) &ao_scheme_stdin,
+ },
+ {
+ .type = NULL,
+ .addr = (void **) (void *) &ao_scheme_stdout,
+ },
+ {
+ .type = NULL,
+ .addr = (void **) (void *) &ao_scheme_stderr,
+ },
+#endif
#ifdef AO_SCHEME_MAKE_CONST
{
.type = &ao_scheme_bool_type,
};
};
-#define AO_SCHEME_NCHUNK 64
+#define AO_SCHEME_NCHUNK (AO_SCHEME_POOL / 64)
static struct ao_scheme_chunk ao_scheme_chunk[AO_SCHEME_NCHUNK];
/* Offset of an address within the pool. */
static inline uint16_t pool_offset(void *addr) {
#if DBG_MEM
- if (!AO_SCHEME_IS_POOL(addr))
+ if (!ao_scheme_is_pool_addr(addr))
ao_scheme_abort();
#endif
return ((uint8_t *) addr) - ao_scheme_pool;
#define DUMP_BUSY()
#endif
+#if MDBG_DUMP
+static void
+dump_atoms(int show_marked)
+{
+ struct ao_scheme_atom *atom;
+
+ printf("atoms {\n");
+ for (atom = ao_scheme_atoms; atom; atom = ao_scheme_poly_atom(atom->next)) {
+ printf("\t%d: %s", MDBG_OFFSET(atom), atom->name);
+ if (show_marked)
+ printf(" %s", ao_scheme_marked(atom) ? "referenced" : "unreferenced");
+ printf("\n");
+ }
+ printf("}\n");
+
+}
+#define DUMP_ATOMS(a) dump_atoms(a)
+#else
+#define DUMP_ATOMS(a)
+#endif
+
static const struct ao_scheme_type * const ao_scheme_types[AO_SCHEME_NUM_TYPE] = {
[AO_SCHEME_CONS] = &ao_scheme_cons_type,
[AO_SCHEME_INT] = NULL,
#ifdef AO_SCHEME_FEATURE_VECTOR
[AO_SCHEME_VECTOR] = &ao_scheme_vector_type,
#endif
+#ifdef AO_SCHEME_FEATURE_PORT
+ [AO_SCHEME_PORT] = &ao_scheme_port_type,
+#endif
};
static int
#endif
MDBG_MOVE("collect %lu\n", ao_scheme_collects[style]);
- MDBG_DO(ao_scheme_frame_write(ao_scheme_frame_poly(ao_scheme_frame_global)));
+ MDBG_DO(ao_scheme_frame_write(stdout, ao_scheme_frame_poly(ao_scheme_frame_global), true));
MDBG_DO(++ao_scheme_collecting);
ao_scheme_reset_stack();
reset_chunks();
walk(ao_scheme_mark_ref, ao_scheme_poly_mark_ref);
+#ifdef AO_SCHEME_FEATURE_PORT
+ ao_scheme_port_check_references();
+#endif
+ ao_scheme_atom_check_references();
+
#if DBG_MEM_RECORD
ao_scheme_record_free(mark_record);
mark_record = ao_scheme_record_save();
ao_scheme_record_compare("mark", move_record, mark_record);
#endif
+ DUMP_ATOMS(1);
DUMP_BUSY();
/* Find the first moving object */
if (chunk_first < chunk_last) {
/* Relocate all references to the objects */
walk(ao_scheme_move, ao_scheme_poly_move);
+ ao_scheme_atom_move();
+#ifdef AO_SCHEME_FEATURE_PORT
+ /* the set of open ports gets relocated but not marked, so
+ * just deal with it separately
+ */
+ ao_scheme_poly_move(&ao_scheme_open_ports, 0);
+#endif
#if DBG_MEM_RECORD
ao_scheme_record_free(move_record);
if (mark_record && move_record)
ao_scheme_record_compare("move", mark_record, move_record);
#endif
+ DUMP_ATOMS(0);
}
#if DBG_MEM_STATS
reset_chunks();
walk(ao_scheme_mark_ref, ao_scheme_poly_mark_ref);
while (cons) {
- if (!AO_SCHEME_IS_POOL(cons))
+ if (!ao_scheme_is_pool_addr(cons))
break;
offset = pool_offset(cons);
if (busy(ao_scheme_busy, offset)) {
ao_scheme_mark_memory(const struct ao_scheme_type *type, void *addr)
{
int offset;
- if (!AO_SCHEME_IS_POOL(addr))
+ if (!ao_scheme_is_pool_addr(addr))
return 1;
offset = pool_offset(addr);
ao_scheme_mark(const struct ao_scheme_type *type, void *addr)
{
int ret;
- MDBG_MOVE("mark %d\n", MDBG_OFFSET(addr));
+ MDBG_MOVE("mark offset %d\n", MDBG_OFFSET(addr));
MDBG_MOVE_IN();
ret = ao_scheme_mark_memory(type, addr);
if (!ret) {
return 1;
addr = ao_scheme_ref(p);
- if (!AO_SCHEME_IS_POOL(addr))
+ if (!ao_scheme_is_pool_addr(addr))
return 1;
if (type == AO_SCHEME_CONS && do_note_cons) {
ao_scheme_abort();
#endif
- MDBG_MOVE("mark %d\n", MDBG_OFFSET(addr));
+ MDBG_MOVE("poly_mark offset %d\n", MDBG_OFFSET(addr));
MDBG_MOVE_IN();
ret = ao_scheme_mark_memory(lisp_type, addr);
if (!ret) {
void *addr = *ref;
uint16_t offset, orig_offset;
- if (!AO_SCHEME_IS_POOL(addr))
+ if (!ao_scheme_is_pool_addr(addr))
return 1;
(void) type;
offset = move_map(orig_offset);
if (offset != orig_offset) {
MDBG_MOVE("update ref %d %d -> %d\n",
- AO_SCHEME_IS_POOL(ref) ? MDBG_OFFSET(ref) : -1,
+ ao_scheme_is_pool_addr(ref) ? MDBG_OFFSET(ref) : -1,
orig_offset, offset);
*ref = ao_scheme_pool + offset;
}
return 1;
addr = ao_scheme_ref(p);
- if (!AO_SCHEME_IS_POOL(addr))
+ if (!ao_scheme_is_pool_addr(addr))
return 1;
orig_offset = pool_offset(addr);
return ret;
}
+int
+ao_scheme_marked(void *addr)
+{
+ if (!ao_scheme_is_pool_addr(addr))
+ return 1;
+ return busy(ao_scheme_busy, pool_offset(addr));
+}
+
#if DBG_MEM
static void
ao_scheme_validate(void)
}
void
-ao_scheme_cons_stash(int id, struct ao_scheme_cons *cons)
+ao_scheme_poly_stash(ao_poly p)
{
- assert(save_cons[id] == 0);
- save_cons[id] = cons;
-}
-
-struct ao_scheme_cons *
-ao_scheme_cons_fetch(int id)
-{
- struct ao_scheme_cons *cons = save_cons[id];
- save_cons[id] = NULL;
- return cons;
-}
-
-void
-ao_scheme_poly_stash(int id, ao_poly poly)
-{
- assert(save_poly[id] == AO_SCHEME_NIL);
- save_poly[id] = poly;
+ assert(stash_poly_ptr < AO_SCHEME_NUM_STASH);
+ stash_poly[stash_poly_ptr++] = p;
}
ao_poly
-ao_scheme_poly_fetch(int id)
-{
- ao_poly poly = save_poly[id];
- save_poly[id] = AO_SCHEME_NIL;
- return poly;
-}
-
-void
-ao_scheme_string_stash(int id, struct ao_scheme_string *string)
-{
- assert(save_string[id] == NULL);
- save_string[id] = string;
-}
-
-struct ao_scheme_string *
-ao_scheme_string_fetch(int id)
-{
- struct ao_scheme_string *string = save_string[id];
- save_string[id] = NULL;
- return string;
-}
-
-void
-ao_scheme_frame_stash(int id, struct ao_scheme_frame *frame)
+ao_scheme_poly_fetch(void)
{
- assert(save_frame[id] == NULL);
- save_frame[id] = frame;
-}
+ ao_poly p;
-struct ao_scheme_frame *
-ao_scheme_frame_fetch(int id)
-{
- struct ao_scheme_frame *frame = save_frame[id];
- save_frame[id] = NULL;
- return frame;
+ assert (stash_poly_ptr > 0);
+ p = stash_poly[--stash_poly_ptr];
+ stash_poly[stash_poly_ptr] = AO_SCHEME_NIL;
+ return p;
}
int
ao_scheme_abort();
#endif
- if (!AO_SCHEME_IS_POOL(addr))
- return 1;
+ if (!ao_scheme_is_pool_addr(addr))
+ return 0;
if (!ao_scheme_print_cleared) {
ao_scheme_print_cleared = 1;
return 0;
}
-int
-ao_scheme_print_mark_poly(ao_poly p)
+void
+ao_scheme_print_clear_addr(void *addr)
{
- uint8_t type = ao_scheme_poly_base_type(p);
+ int offset;
- if (type == AO_SCHEME_INT)
- return 1;
- return ao_scheme_print_mark_addr(ao_scheme_ref(p));
+#if DBG_MEM
+ if (ao_scheme_collecting)
+ ao_scheme_abort();
+#endif
+
+ if (!ao_scheme_is_pool_addr(addr))
+ return;
+
+ if (!ao_scheme_print_cleared)
+ return;
+ offset = pool_offset(addr);
+ clear(ao_scheme_busy, offset);
}
/* Notes that printing has started */
ao_scheme_printing++;
}
-/* Notes that printing has ended */
-void
+/* Notes that printing has ended. Returns 1 if printing is still going on */
+int
ao_scheme_print_stop(void)
{
ao_scheme_printing--;
- if (ao_scheme_printing == 0)
- ao_scheme_print_cleared = 0;
+ if (ao_scheme_printing != 0)
+ return 1;
+ ao_scheme_print_cleared = 0;
+ return 0;
}
projects / fw / altos / blobdiff