#endif
+#ifndef DBG_MEM_STATS
+#define DBG_MEM_STATS DBG_MEM
+#endif
+
#if DBG_MEM
int dbg_move_depth;
int dbg_mem = DBG_MEM_START;
static struct ao_lisp_cons *save_cons[2];
static char *save_string[2];
-static ao_poly save_poly[2];
+static ao_poly save_poly[3];
static const struct ao_lisp_root ao_lisp_root[] = {
{
},
{
.type = &ao_lisp_string_type,
- .addr = (void **) &save_string[0]
+ .addr = (void **) &save_string[0],
},
{
.type = &ao_lisp_string_type,
- .addr = (void **) &save_string[1]
+ .addr = (void **) &save_string[1],
+ },
+ {
+ .type = NULL,
+ .addr = (void **) (void *) &save_poly[0]
},
{
.type = NULL,
- .addr = (void **) &save_poly[0]
+ .addr = (void **) (void *) &save_poly[1]
},
{
.type = NULL,
- .addr = (void **) &save_poly[1]
+ .addr = (void **) (void *) &save_poly[2]
},
{
.type = &ao_lisp_atom_type,
},
{
.type = NULL,
- .addr = (void **) &ao_lisp_v,
+ .addr = (void **) (void *) &ao_lisp_v,
},
{
.type = &ao_lisp_cons_type,
(const void **) &ao_lisp_frame_free_list[1],
(const void **) &ao_lisp_frame_free_list[2],
(const void **) &ao_lisp_frame_free_list[3],
+ (const void **) &ao_lisp_frame_free_list[4],
+ (const void **) &ao_lisp_frame_free_list[5],
};
-#if AO_LISP_FRAME_FREE != 4
+#if AO_LISP_FRAME_FREE != 6
#error Unexpected AO_LISP_FRAME_FREE value
#endif
uint16_t ao_lisp_top;
struct ao_lisp_chunk {
- uint16_t old_addr;
+ uint16_t old_offset;
union {
uint16_t size;
- uint16_t new_addr;
+ uint16_t new_offset;
};
};
return ((uint8_t *) addr) - ao_lisp_pool;
}
-/*
- * Convert back and forth between 'poly's used
- * as short addresses in the pool and addresses.
- * These are used in the chunk code.
- */
-static inline ao_poly pool_poly(void *addr) {
-#if DBG_MEM
- if (!AO_LISP_IS_POOL(addr))
- ao_lisp_abort();
-#endif
- return ((uint8_t *) addr) - AO_LISP_POOL_BASE;
-}
-
-static inline void *pool_ref(ao_poly p) {
- return AO_LISP_POOL_BASE + p;
-}
-
static inline void mark(uint8_t *tag, int offset) {
int byte = offset >> 5;
int bit = (offset >> 2) & 7;
return min(AO_LISP_POOL, max(offset, 0));
}
-static int total_marked;
-
static void
-note_cons(void *addr)
+note_cons(uint16_t offset)
{
- if (AO_LISP_IS_POOL(addr)) {
- int offset = pool_offset(addr);
- MDBG_MOVE("note cons %d\n", MDBG_OFFSET(addr));
- ao_lisp_cons_noted = 1;
- mark(ao_lisp_cons_note, offset);
- }
+ MDBG_MOVE("note cons %d\n", offset);
+ ao_lisp_cons_noted = 1;
+ mark(ao_lisp_cons_note, offset);
}
static uint16_t chunk_low, chunk_high;
static uint16_t chunk_first, chunk_last;
-static int chunk_busy;
-static void
-note_chunk(uint16_t addr, uint16_t size)
+static int
+find_chunk(uint16_t offset)
{
int l, r;
-
- if (addr < chunk_low || chunk_high <= addr)
- return;
-
/* Binary search for the location */
- l = 0;
- r = chunk_busy - 1;
+ l = chunk_first;
+ r = chunk_last - 1;
while (l <= r) {
int m = (l + r) >> 1;
- if (ao_lisp_chunk[m].old_addr < addr)
+ if (ao_lisp_chunk[m].old_offset < offset)
l = m + 1;
else
r = m - 1;
}
+ return l;
+}
+
+static void
+note_chunk(uint16_t offset, uint16_t size)
+{
+ int l;
+
+ if (offset < chunk_low || chunk_high <= offset)
+ return;
+
+ l = find_chunk(offset);
+
/*
* The correct location is always in 'l', with r = l-1 being
* the entry before the right one
ao_lisp_abort();
/* Off the left side */
- if (l == 0 && chunk_busy && addr > ao_lisp_chunk[0].old_addr)
+ if (l == 0 && chunk_last && offset > ao_lisp_chunk[0].old_offset)
ao_lisp_abort();
#endif
/* Shuffle existing entries right */
- int end = min(AO_LISP_NCHUNK, chunk_busy + 1);
+ int end = min(AO_LISP_NCHUNK, chunk_last + 1);
memmove(&ao_lisp_chunk[l+1],
&ao_lisp_chunk[l],
(end - (l+1)) * sizeof (struct ao_lisp_chunk));
/* Add new entry */
- ao_lisp_chunk[l].old_addr = addr;
+ ao_lisp_chunk[l].old_offset = offset;
ao_lisp_chunk[l].size = size;
/* Increment the number of elements up to the size of the array */
- if (chunk_busy < AO_LISP_NCHUNK)
- chunk_busy++;
+ if (chunk_last < AO_LISP_NCHUNK)
+ chunk_last++;
/* Set the top address if the array is full */
- if (chunk_busy == AO_LISP_NCHUNK)
- chunk_high = ao_lisp_chunk[AO_LISP_NCHUNK-1].old_addr +
+ if (chunk_last == AO_LISP_NCHUNK)
+ chunk_high = ao_lisp_chunk[AO_LISP_NCHUNK-1].old_offset +
ao_lisp_chunk[AO_LISP_NCHUNK-1].size;
}
static void
reset_chunks(void)
{
- memset(ao_lisp_chunk, '\0', sizeof (ao_lisp_chunk));
chunk_high = ao_lisp_top;
- chunk_busy = 0;
+ chunk_last = 0;
+ chunk_first = 0;
}
/*
{
int i;
- total_marked = 0;
ao_lisp_record_reset();
memset(ao_lisp_busy, '\0', sizeof (ao_lisp_busy));
memset(ao_lisp_cons_note, '\0', sizeof (ao_lisp_cons_note));
[AO_LISP_BUILTIN] = &ao_lisp_builtin_type,
[AO_LISP_FRAME] = &ao_lisp_frame_type,
[AO_LISP_LAMBDA] = &ao_lisp_lambda_type,
+ [AO_LISP_STACK] = &ao_lisp_stack_type,
};
static int
return ao_lisp_poly_mark(*p, do_note_cons);
}
+#if DBG_MEM_STATS
int ao_lisp_collects[2];
int ao_lisp_freed[2];
int ao_lisp_loops[2];
+#endif
int ao_lisp_last_top;
int
ao_lisp_collect(uint8_t style)
{
- int ret;
int i;
int top;
+#if DBG_MEM_STATS
int loops = 0;
+#endif
#if DBG_MEM
- int marked;
- int moved;
struct ao_lisp_record *mark_record = NULL, *move_record = NULL;
- MDBG_MOVE("collect %d\n", ao_lisp_collects);
- marked = moved = 0;
+ MDBG_MOVE("collect %d\n", ao_lisp_collects[style]);
#endif
/* The first time through, we're doing a full collect */
chunk_low = top = ao_lisp_last_top;
}
for (;;) {
+#if DBG_MEM_STATS
loops++;
+#endif
MDBG_MOVE("move chunks from %d to %d\n", chunk_low, top);
/* Find the sizes of the first chunk of objects to move */
reset_chunks();
walk(ao_lisp_mark_ref, ao_lisp_poly_mark_ref);
#if DBG_MEM
- marked = total_marked;
ao_lisp_record_free(mark_record);
mark_record = ao_lisp_record_save();
if (mark_record && move_record)
ao_lisp_record_compare("mark", move_record, mark_record);
-
- if (moved && moved != marked)
- ao_lisp_abort();
#endif
DUMP_BUSY();
/* Find the first moving object */
- for (i = 0; i < AO_LISP_NCHUNK; i++) {
+ for (i = 0; i < chunk_last; i++) {
uint16_t size = ao_lisp_chunk[i].size;
+#if DBG_MEM
if (!size)
- break;
+ ao_lisp_abort();
+#endif
- if (ao_lisp_chunk[i].old_addr > top)
+ if (ao_lisp_chunk[i].old_offset > top)
break;
+
+ MDBG_MOVE("chunk %d %d not moving\n",
+ ao_lisp_chunk[i].old_offset,
+ ao_lisp_chunk[i].size);
#if DBG_MEM
- if (ao_lisp_chunk[i].old_addr != top)
+ if (ao_lisp_chunk[i].old_offset != top)
ao_lisp_abort();
#endif
-
top += size;
- MDBG_MOVE("chunk %d %d not moving\n",
- ao_lisp_chunk[i].old_addr,
- ao_lisp_chunk[i].size);
}
+ /*
+ * Limit amount of chunk array used in mapping moves
+ * to the active region
+ */
chunk_first = i;
+ chunk_low = ao_lisp_chunk[i].old_offset;
+
/* Copy all of the objects */
- for (; i < AO_LISP_NCHUNK; i++) {
+ for (; i < chunk_last; i++) {
uint16_t size = ao_lisp_chunk[i].size;
+#if DBG_MEM
if (!size)
- break;
+ ao_lisp_abort();
+#endif
MDBG_MOVE("chunk %d %d -> %d\n",
- ao_lisp_chunk[i].old_addr,
+ ao_lisp_chunk[i].old_offset,
size,
top);
- ao_lisp_chunk[i].new_addr = top;
+ ao_lisp_chunk[i].new_offset = top;
+
memmove(&ao_lisp_pool[top],
- &ao_lisp_pool[ao_lisp_chunk[i].old_addr],
+ &ao_lisp_pool[ao_lisp_chunk[i].old_offset],
size);
+
top += size;
}
- chunk_last = i;
-
if (chunk_first < chunk_last) {
/* Relocate all references to the objects */
walk(ao_lisp_move, ao_lisp_poly_move);
move_record = ao_lisp_record_save();
if (mark_record && move_record)
ao_lisp_record_compare("move", mark_record, move_record);
-
- moved = total_marked;
- if (moved != marked)
- ao_lisp_abort();
#endif
}
+ /* If we ran into the end of the heap, then
+ * there's no need to keep walking
+ */
if (chunk_last != AO_LISP_NCHUNK)
break;
+ /* Next loop starts right above this loop */
chunk_low = chunk_high;
}
- /* Compute amount of memory freed */
- ret = ao_lisp_top - top;
-
+#if DBG_MEM_STATS
/* Collect stats */
++ao_lisp_collects[style];
- ao_lisp_freed[style] += ret;
+ ao_lisp_freed[style] += ao_lisp_top - top;
ao_lisp_loops[style] += loops;
+#endif
ao_lisp_top = top;
if (style == AO_LISP_COLLECT_FULL)
MDBG_DO(memset(ao_lisp_chunk, '\0', sizeof (ao_lisp_chunk));
walk(ao_lisp_mark_ref, ao_lisp_poly_mark_ref));
- return ret;
+ return AO_LISP_POOL - ao_lisp_top;
}
/*
* Mark interfaces for objects
- *
- * Note a reference to memory and
- * collect information about a few object sizes
- * at a time
+ */
+
+/*
+ * Note a reference to memory and collect information about a few
+ * object sizes at a time
*/
int
return 0;
}
+/*
+ * Mark an object and all that it refereces
+ */
int
ao_lisp_mark(const struct ao_lisp_type *type, void *addr)
{
return ret;
}
+/*
+ * Mark an object, unless it is a cons cell and
+ * do_note_cons is set. In that case, just
+ * set a bit in the cons note array; those
+ * will be marked in a separate pass to avoid
+ * deep recursion in the collector
+ */
int
ao_lisp_poly_mark(ao_poly p, uint8_t do_note_cons)
{
uint8_t type;
void *addr;
- if (!p)
+ type = ao_lisp_poly_base_type(p);
+
+ if (type == AO_LISP_INT)
return 1;
- type = ao_lisp_poly_base_type(p);
addr = ao_lisp_ref(p);
-
if (!AO_LISP_IS_POOL(addr))
return 1;
if (type == AO_LISP_CONS && do_note_cons) {
- note_cons(ao_lisp_ref(p));
+ note_cons(pool_offset(addr));
return 1;
} else {
- const struct ao_lisp_type *lisp_type;
+ if (type == AO_LISP_OTHER)
+ type = ao_lisp_other_type(addr);
- if (type == AO_LISP_OTHER) {
- type = ao_lisp_other_type(ao_lisp_poly_other(p));
+ const struct ao_lisp_type *lisp_type = ao_lisp_types[type];
#if DBG_MEM
- if (type <= AO_LISP_OTHER || AO_LISP_NUM_TYPE <= type)
- ao_lisp_abort();
+ if (!lisp_type)
+ ao_lisp_abort();
#endif
- }
- lisp_type = ao_lisp_types[ao_lisp_poly_type(p)];
- if (!lisp_type)
- return 1;
- return ao_lisp_mark(lisp_type, ao_lisp_ref(p));
+ return ao_lisp_mark(lisp_type, addr);
}
}
-static void *
-move_map(void *addr)
+/*
+ * Find the current location of an object
+ * based on the original location. For unmoved
+ * objects, this is simple. For moved objects,
+ * go search for it
+ */
+
+static uint16_t
+move_map(uint16_t offset)
{
- uint16_t offset = pool_offset(addr);
- int i;
-
- for (i = chunk_first; i < chunk_last; i++) {
- if (ao_lisp_chunk[i].old_addr == offset) {
- MDBG_MOVE("move %d -> %d\n",
- ao_lisp_chunk[i].old_addr,
- ao_lisp_chunk[i].new_addr);
- return ao_lisp_pool + ao_lisp_chunk[i].new_addr;
- }
- }
- return addr;
+ int l;
+
+ if (offset < chunk_low || chunk_high <= offset)
+ return offset;
+
+ l = find_chunk(offset);
+
+#if DBG_MEM
+ if (ao_lisp_chunk[l].old_offset != offset)
+ ao_lisp_abort();
+#endif
+ return ao_lisp_chunk[l].new_offset;
}
int
ao_lisp_move_memory(const struct ao_lisp_type *type, void **ref)
{
void *addr = *ref;
- int offset;
+ uint16_t offset, orig_offset;
if (!AO_LISP_IS_POOL(addr))
return 1;
(void) type;
MDBG_MOVE("move memory %d\n", MDBG_OFFSET(addr));
- addr = move_map(addr);
- if (addr != *ref) {
+ orig_offset = pool_offset(addr);
+ offset = move_map(orig_offset);
+ if (offset != orig_offset) {
MDBG_MOVE("update ref %d %d -> %d\n",
AO_LISP_IS_POOL(ref) ? MDBG_OFFSET(ref) : -1,
- MDBG_OFFSET(*ref), MDBG_OFFSET(addr));
- *ref = addr;
+ orig_offset, offset);
+ *ref = ao_lisp_pool + offset;
}
- offset = pool_offset(addr);
if (busy(ao_lisp_busy, offset)) {
MDBG_MOVE("already moved\n");
return 1;
int
ao_lisp_poly_move(ao_poly *ref, uint8_t do_note_cons)
{
- uint8_t type;
- ao_poly p = *ref;
- int ret;
- void *addr;
+ uint8_t type;
+ ao_poly p = *ref;
+ int ret;
+ void *addr;
+ uint16_t offset, orig_offset;
+ uint8_t base_type;
+
+ base_type = type = ao_lisp_poly_base_type(p);
- if (!p)
+ if (type == AO_LISP_INT)
return 1;
addr = ao_lisp_ref(p);
-
if (!AO_LISP_IS_POOL(addr))
return 1;
- type = ao_lisp_poly_base_type(p);
+ orig_offset = pool_offset(addr);
+ offset = move_map(orig_offset);
if (type == AO_LISP_CONS && do_note_cons) {
- note_cons(addr);
- addr = move_map(addr);
+ note_cons(orig_offset);
ret = 1;
} else {
- const struct ao_lisp_type *lisp_type;
+ if (type == AO_LISP_OTHER)
+ type = ao_lisp_other_type(ao_lisp_pool + offset);
- if (type == AO_LISP_OTHER) {
- type = ao_lisp_other_type(move_map(ao_lisp_poly_other(p)));
+ const struct ao_lisp_type *lisp_type = ao_lisp_types[type];
#if DBG_MEM
- if (type <= AO_LISP_OTHER || AO_LISP_NUM_TYPE <= type)
- ao_lisp_abort();
+ if (!lisp_type)
+ ao_lisp_abort();
#endif
- }
- lisp_type = ao_lisp_types[type];
- if (!lisp_type)
- return 1;
ret = ao_lisp_move(lisp_type, &addr);
}
/* Re-write the poly value */
- if (addr != ao_lisp_ref(p)) {
- ao_poly np = ao_lisp_poly(addr, p & AO_LISP_TYPE_MASK);
+ if (offset != orig_offset) {
+ ao_poly np = ao_lisp_poly(ao_lisp_pool + offset, base_type);
MDBG_MOVE("poly %d moved %d -> %d\n",
- type, MDBG_OFFSET(ao_lisp_ref(p)), MDBG_OFFSET(ao_lisp_ref(np)));
+ type, orig_offset, offset);
*ref = np;
}
return ret;
MDBG_DO(++dbg_allocs);
MDBG_DO(if (dbg_validate) ao_lisp_validate());
size = ao_lisp_size_round(size);
- if (ao_lisp_top + size > AO_LISP_POOL) {
- if (!ao_lisp_collect(AO_LISP_COLLECT_INCREMENTAL) &&
- !ao_lisp_collect(AO_LISP_COLLECT_FULL))
- {
- ao_lisp_error(AO_LISP_OOM, "out of memory");
- return NULL;
- }
+ if (AO_LISP_POOL - ao_lisp_top < size &&
+ ao_lisp_collect(AO_LISP_COLLECT_INCREMENTAL) < size &&
+ ao_lisp_collect(AO_LISP_COLLECT_FULL) < size)
+ {
+ ao_lisp_error(AO_LISP_OOM, "out of memory");
+ return NULL;
}
addr = ao_lisp_pool + ao_lisp_top;
ao_lisp_top += size;
return cons;
}
+void
+ao_lisp_poly_stash(int id, ao_poly poly)
+{
+ save_poly[id] = poly;
+}
+
+ao_poly
+ao_lisp_poly_fetch(int id)
+{
+ ao_poly poly = save_poly[id];
+ save_poly[id] = AO_LISP_NIL;
+ return poly;
+}
+
void
ao_lisp_string_stash(int id, char *string)
{
save_string[id] = NULL;
return string;
}
-void
-ao_lisp_poly_stash(int id, ao_poly poly)
-{
- save_poly[id] = poly;
-}
-ao_poly
-ao_lisp_poly_fetch(int id)
-{
- ao_poly poly = save_poly[id];
- save_poly[id] = AO_LISP_NIL;
- return poly;
-}
projects / fw / altos / blobdiff