X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_mem.c;h=31ee9e1e339739ff4965b0469e13f8575727abe6;hb=c8d2b9acf4b118f36a114de2af4db42ae04426ed;hp=9e716da9b2ebfbf82b6ccce6c55b1afc53b3432a;hpb=546e58b0a868662271553a15f2b1c1a8ea317582;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_mem.c b/src/lisp/ao_lisp_mem.c
index 9e716da9..31ee9e1e 100644
--- a/src/lisp/ao_lisp_mem.c
+++ b/src/lisp/ao_lisp_mem.c
@@ -28,31 +28,31 @@ uint8_t	ao_lisp_pool[AO_LISP_POOL] __attribute__((aligned(4)));
 #endif
 
 #if 0
-#define DBG_COLLECT_ALWAYS
+#define MDBG_COLLECT_ALWAYS
 #endif
 
 #if 0
-#define DBG_POOL
+#define MDBG_POOL
 #endif
 
 #if 0
-#define DBG_DUMP	0
-#define DBG_OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_pool))
-#define DBG(...) printf(__VA_ARGS__)
-#define DBG_DO(a)	a
-static int move_dump;
+#include <assert.h>
+#define MDBG_INCLUDE
+#if 1
+#define MDBG_MOVE(...) do { int d; for (d = 0; d < move_depth; d++) printf ("  "); printf(__VA_ARGS__); } while (0)
+#endif
+#define MDBG_OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_pool))
+#define MDBG(...) printf(__VA_ARGS__)
+#define MDBG_DO(a)	a
 static int move_depth;
-#define DBG_RESET() (move_depth = 0)
-#define DBG_MOVE(...) do { if(move_dump) { int d; for (d = 0; d < move_depth; d++) printf ("  "); printf(__VA_ARGS__); } } while (0)
-#define DBG_MOVE_IN()	(move_depth++)
-#define DBG_MOVE_OUT()	(move_depth--)
+#define MDBG_MOVE_IN()	(move_depth++)
+#define MDBG_MOVE_OUT()	(assert(--move_depth >= 0))
 #else
-#define DBG(...)
-#define DBG_DO(a)
-#define DBG_RESET()
-#define DBG_MOVE(...)
-#define DBG_MOVE_IN()
-#define DBG_MOVE_OUT()
+#define MDBG(...)
+#define MDBG_DO(a)
+#define MDBG_MOVE(...)
+#define MDBG_MOVE_IN()
+#define MDBG_MOVE_OUT()
 #endif
 
 uint8_t	ao_lisp_exception;
@@ -66,9 +66,13 @@ struct ao_lisp_root {
 
 static struct ao_lisp_root	ao_lisp_root[AO_LISP_ROOT];
 
-static uint8_t	ao_lisp_busy[AO_LISP_POOL / 32];
+#define AO_LISP_BUSY_SIZE	((AO_LISP_POOL + 31) / 32)
 
-static uint8_t	ao_lisp_moving[AO_LISP_POOL / 32];
+static uint8_t	ao_lisp_busy[AO_LISP_BUSY_SIZE];
+static uint8_t	ao_lisp_moving[AO_LISP_BUSY_SIZE];
+static uint8_t	ao_lisp_cons_note[AO_LISP_BUSY_SIZE];
+static uint8_t	ao_lisp_cons_last[AO_LISP_BUSY_SIZE];
+static uint8_t	ao_lisp_cons_noted;
 
 uint16_t	ao_lisp_top;
 
@@ -160,41 +164,64 @@ busy_object(uint8_t *tag, void *addr) {
 	return 0;
 }
 
-static void	*move_old, *move_new;
-static int	move_size;
+static void
+note_cons(void *addr)
+{
+	if (AO_LISP_IS_POOL(addr)) {
+		int	offset = (uint8_t *) addr - ao_lisp_pool;
+		MDBG_MOVE("note cons %d\n", MDBG_OFFSET(addr));
+		ao_lisp_cons_noted = 1;
+		mark(ao_lisp_cons_note, offset);
+	}
+}
+
+/*
+ * Walk all referenced objects calling functions on each one
+ */
 
 static void
-move_object(void)
+walk(uint8_t *tag,
+     int (*visit_addr)(const struct ao_lisp_type *type, void **addr),
+     int (*visit_poly)(ao_poly *p, uint8_t do_note_cons))
 {
-	int	i;
+	int i;
 
-	DBG_RESET();
-	DBG_MOVE("move %d -> %d\n", DBG_OFFSET(move_old), DBG_OFFSET(move_new));
-	DBG_MOVE_IN();
-	memset(ao_lisp_moving, '\0', sizeof (ao_lisp_moving));
+	memset(tag, '\0', sizeof (ao_lisp_busy));
+	memset(ao_lisp_cons_note, '\0', sizeof (ao_lisp_cons_note));
+	ao_lisp_cons_noted = 0;
 	for (i = 0; i < AO_LISP_ROOT; i++) {
-		if (!ao_lisp_root[i].addr)
-			continue;
 		if (ao_lisp_root[i].type) {
-			DBG_DO(void *addr = *ao_lisp_root[i].addr);
-			DBG_MOVE("root %d\n", DBG_OFFSET(addr));
-			if (!ao_lisp_move(ao_lisp_root[i].type,
-					  ao_lisp_root[i].addr))
-				DBG_MOVE("root moves from %p to %p\n",
-					 addr,
-					 *ao_lisp_root[i].addr);
+			void **a = ao_lisp_root[i].addr, *v;
+			if (a && (v = *a)) {
+				MDBG("root ptr %d\n", MDBG_OFFSET(v));
+				visit_addr(ao_lisp_root[i].type, a);
+			}
 		} else {
-			DBG_DO(ao_poly p = *(ao_poly *) ao_lisp_root[i].addr);
-			if (!ao_lisp_poly_move((ao_poly *) ao_lisp_root[i].addr))
-				DBG_MOVE("root poly move from %04x to %04x\n",
-					 p, *(ao_poly *) ao_lisp_root[i].addr);
+			ao_poly *a = (ao_poly *) ao_lisp_root[i].addr, p;
+			if (a && (p = *a)) {
+				MDBG("root poly %d\n", MDBG_OFFSET(ao_lisp_ref(p)));
+				visit_poly(a, 0);
+			}
+		}
+	}
+	while (ao_lisp_cons_noted) {
+		memcpy(ao_lisp_cons_last, ao_lisp_cons_note, sizeof (ao_lisp_cons_note));
+		memset(ao_lisp_cons_note, '\0', sizeof (ao_lisp_cons_note));
+		ao_lisp_cons_noted = 0;
+		for (i = 0; i < AO_LISP_POOL; i += 4) {
+			if (busy(ao_lisp_cons_last, i)) {
+				void *v = ao_lisp_pool + i;
+				MDBG("root cons %d\n", MDBG_OFFSET(v));
+				visit_addr(&ao_lisp_cons_type, &v);
+			}
 		}
 	}
-	DBG_MOVE_OUT();
-	DBG_MOVE("move done\n");
 }
 
-#if DBG_DUMP
+static void	*move_old, *move_new;
+static int	move_size;
+
+#if MDBG_DUMP
 static void
 dump_busy(void)
 {
@@ -217,28 +244,27 @@ dump_busy(void)
 #define DUMP_BUSY()
 #endif
 
-static void
-ao_lisp_mark_busy(void)
+static const struct ao_lisp_type const *ao_lisp_types[AO_LISP_NUM_TYPE] = {
+	[AO_LISP_CONS] = &ao_lisp_cons_type,
+	[AO_LISP_INT] = NULL,
+	[AO_LISP_STRING] = &ao_lisp_string_type,
+	[AO_LISP_OTHER] = (void *) 0x1,
+	[AO_LISP_ATOM] = &ao_lisp_atom_type,
+	[AO_LISP_BUILTIN] = &ao_lisp_builtin_type,
+	[AO_LISP_FRAME] = &ao_lisp_frame_type,
+	[AO_LISP_LAMBDA] = &ao_lisp_lambda_type,
+};
+
+static int
+ao_lisp_mark_ref(const struct ao_lisp_type *type, void **ref)
 {
-	int i;
+	return ao_lisp_mark(type, *ref);
+}
 
-	memset(ao_lisp_busy, '\0', sizeof (ao_lisp_busy));
-	DBG("mark\n");
-	for (i = 0; i < AO_LISP_ROOT; i++) {
-		if (ao_lisp_root[i].type) {
-			void **a = ao_lisp_root[i].addr, *v;
-			if (a && (v = *a)) {
-				DBG("root %p\n", v);
-				ao_lisp_mark(ao_lisp_root[i].type, v);
-			}
-		} else {
-			ao_poly *a = (ao_poly *) ao_lisp_root[i].addr, p;
-			if (a && (p = *a)) {
-				DBG("root %04x\n", p);
-				ao_lisp_poly_mark(p);
-			}
-		}
-	}
+static int
+ao_lisp_poly_mark_ref(ao_poly *p, uint8_t do_note_cons)
+{
+	return ao_lisp_poly_mark(*p, do_note_cons);
 }
 
 void
@@ -247,13 +273,13 @@ ao_lisp_collect(void)
 	int	i;
 	int	top;
 
-	DBG("collect\n");
+	MDBG("collect\n");
 	/* Mark */
-	ao_lisp_mark_busy();
+	walk(ao_lisp_busy, ao_lisp_mark_ref, ao_lisp_poly_mark_ref);
 
 	DUMP_BUSY();
 	/* Compact */
-	DBG("find first busy\n");
+	MDBG("find first busy\n");
 	for (i = 0; i < ao_lisp_top; i += 4) {
 		if (!busy(ao_lisp_busy, i))
 			break;
@@ -261,19 +287,27 @@ ao_lisp_collect(void)
 	top = i;
 	while(i < ao_lisp_top) {
 		if (busy(ao_lisp_busy, i)) {
-			DBG("busy %d -> %d\n", i, top);
+			MDBG("busy %d -> %d\n", i, top);
+			MDBG_MOVE_IN();
 			move_old = &ao_lisp_pool[i];
 			move_new = &ao_lisp_pool[top];
 			move_size = 0;
-			move_object();
-			DBG("\tbusy size %d\n", move_size);
+			walk(ao_lisp_moving, ao_lisp_move, ao_lisp_poly_move);
+			MDBG("\tbusy size %d\n", move_size);
 			if (move_size == 0)
-				abort();
+				ao_lisp_abort();
 			clear_object(ao_lisp_busy, move_old, move_size);
 			mark_object(ao_lisp_busy, move_new, move_size);
+			if (busy_object(ao_lisp_cons_note, move_old)) {
+				clear_object(ao_lisp_cons_note, move_old, move_size);
+				mark_object(ao_lisp_cons_note, move_new, move_size);
+			}
 			i += move_size;
 			top += move_size;
+#if MDBG_MOVE
 			DUMP_BUSY();
+#endif
+			MDBG_MOVE_OUT();
 		} else {
 			i += 4;
 		}
@@ -287,12 +321,37 @@ ao_lisp_mark(const struct ao_lisp_type *type, void *addr)
 {
 	if (!addr)
 		return 1;
-	if (mark_object(ao_lisp_busy, addr, type->size(addr)))
+	MDBG_MOVE_IN();
+	MDBG_MOVE("mark %d\n", MDBG_OFFSET(addr));
+	if (mark_object(ao_lisp_busy, addr, type->size(addr))) {
+		MDBG_MOVE("already marked\n");
+		MDBG_MOVE_OUT();
 		return 1;
+	}
 	type->mark(addr);
+	MDBG_MOVE_OUT();
 	return 0;
 }
 
+int
+ao_lisp_poly_mark(ao_poly p, uint8_t do_note_cons)
+{
+	uint8_t type = ao_lisp_poly_type(p);
+
+	if (!p)
+		return 1;
+	if (type == AO_LISP_CONS && do_note_cons) {
+		MDBG_MOVE("note cons %d\n", MDBG_OFFSET(ao_lisp_ref(p)));
+		note_cons(ao_lisp_ref(p));
+		return 0;
+	} else {
+		const struct ao_lisp_type *lisp_type = ao_lisp_types[ao_lisp_poly_type(p)];
+		if (lisp_type)
+			return ao_lisp_mark(lisp_type, ao_lisp_ref(p));
+		return 1;
+	}
+}
+
 int
 ao_lisp_mark_memory(void *addr, int size)
 {
@@ -309,7 +368,7 @@ void *
 ao_lisp_move_map(void *addr)
 {
 	if (addr == move_old) {
-		if (busy_object(ao_lisp_moving, addr))
+		if (move_size != 0)
 			return move_new;
 	}
 	return addr;
@@ -319,9 +378,15 @@ static void *
 check_move(void *addr, int size)
 {
 	if (addr == move_old) {
-		DBG_MOVE("mapping %d -> %d\n", DBG_OFFSET(addr), DBG_OFFSET(move_new));
-		if (!busy_object(ao_lisp_moving, addr)) {
-			DBG_MOVE("  copy %d\n", size);
+		MDBG_MOVE("mapping %d -> %d\n", MDBG_OFFSET(addr), MDBG_OFFSET(move_new));
+		if (move_size && move_size != ((size + 3) & ~3))
+			ao_lisp_abort();
+
+		/* Only copy the object once, otherwise we may
+		 * smash stuff
+		 */
+		if (move_size == 0) {
+			MDBG_MOVE("  copy %d\n", size);
 			memmove(move_new, move_old, size);
 			move_size = (size + 3) & ~3;
 		}
@@ -335,33 +400,33 @@ ao_lisp_move(const struct ao_lisp_type *type, void **ref)
 {
 	void		*addr = *ref;
 	uint8_t		*a = addr;
-	int		size = type->size(addr);
+	int		size = type->size(ao_lisp_move_map(addr));
 
 	if (!addr)
-		return NULL;
+		return 1;
 
 #ifndef AO_LISP_MAKE_CONST
 	if (AO_LISP_IS_CONST(addr))
 		return 1;
 #endif
-	DBG_MOVE("object %d\n", DBG_OFFSET(addr));
-	if (a < ao_lisp_pool || ao_lisp_pool + AO_LISP_POOL <= a)
-		abort();
-	DBG_MOVE_IN();
+	MDBG_MOVE("object %d\n", MDBG_OFFSET(addr));
+	if (!AO_LISP_IS_POOL(a))
+		ao_lisp_abort();
+	MDBG_MOVE_IN();
 	addr = check_move(addr, size);
 	if (addr != *ref)
 		*ref = addr;
 	if (mark_object(ao_lisp_moving, addr, size)) {
-		DBG_MOVE("already moved\n");
-		DBG_MOVE_OUT();
+		MDBG_MOVE("already moved\n");
+		MDBG_MOVE_OUT();
 		return 1;
 	}
-	DBG_MOVE_OUT();
-	DBG_MOVE("recursing...\n");
-	DBG_MOVE_IN();
+	MDBG_MOVE_OUT();
+	MDBG_MOVE("recursing...\n");
+	MDBG_MOVE_IN();
 	type->move(addr);
-	DBG_MOVE_OUT();
-	DBG_MOVE("done %d\n", DBG_OFFSET(addr));
+	MDBG_MOVE_OUT();
+	MDBG_MOVE("done %d\n", MDBG_OFFSET(addr));
 	return 0;
 }
 
@@ -370,23 +435,68 @@ ao_lisp_move_memory(void **ref, int size)
 {
 	void *addr = *ref;
 	if (!addr)
-		return NULL;
+		return 1;
 
-	DBG_MOVE("memory %d\n", DBG_OFFSET(addr));
-	DBG_MOVE_IN();
+	MDBG_MOVE("memory %d\n", MDBG_OFFSET(addr));
+	MDBG_MOVE_IN();
 	addr = check_move(addr, size);
 	if (addr != *ref)
 		*ref = addr;
 	if (mark_object(ao_lisp_moving, addr, size)) {
-		DBG_MOVE("already moved\n");
-		DBG_MOVE_OUT();
+		MDBG_MOVE("already moved\n");
+		MDBG_MOVE_OUT();
 		return 1;
 	}
-	DBG_MOVE_OUT();
+	MDBG_MOVE_OUT();
 	return 0;
 }
 
-#ifdef DBG_POOL
+int
+ao_lisp_poly_move(ao_poly *ref, uint8_t do_note_cons)
+{
+	uint8_t				type;
+	ao_poly				p = *ref;
+	const struct ao_lisp_type	*lisp_type;
+	int				ret;
+	void				*addr;
+
+	if (!p)
+		return 1;
+
+	type = ao_lisp_poly_base_type(p);
+	addr = ao_lisp_ref(p);
+
+	if ((uint8_t *) addr < ao_lisp_pool || ao_lisp_pool + AO_LISP_POOL <= (uint8_t*) addr)
+		return 1;
+
+	if (type == AO_LISP_CONS && do_note_cons) {
+		addr = check_move(addr, sizeof (struct ao_lisp_cons));
+		note_cons(addr);
+		ret = 1;
+	} else {
+
+		if (type == AO_LISP_OTHER)
+			type = ao_lisp_other_type(ao_lisp_move_map(ao_lisp_poly_other(p)));
+
+		if (type >= AO_LISP_NUM_TYPE)
+			ao_lisp_abort();
+
+		lisp_type = ao_lisp_types[type];
+		if (!lisp_type)
+			return 1;
+		ret = ao_lisp_move(lisp_type, &addr);
+	}
+
+	if (addr != ao_lisp_ref(p)) {
+		ao_poly np = ao_lisp_poly(addr, p & AO_LISP_TYPE_MASK);
+		MDBG("poly %d moved %d -> %d\n",
+		     type, MDBG_OFFSET(ao_lisp_ref(p)), MDBG_OFFSET(ao_lisp_ref(np)));
+		*ref = np;
+	}
+	return ret;
+}
+
+#ifdef MDBG_POOL
 static int AO_LISP_POOL_CUR = AO_LISP_POOL / 8;
 
 static void
@@ -431,18 +541,18 @@ ao_lisp_alloc(int size)
 	void	*addr;
 
 	size = ao_lisp_mem_round(size);
-#ifdef DBG_COLLECT_ALWAYS
+#ifdef MDBG_COLLECT_ALWAYS
 	ao_lisp_collect();
 #endif
 	if (ao_lisp_top + size > AO_LISP_POOL_CUR) {
-#ifdef DBG_POOL
+#ifdef MDBG_POOL
 		if (AO_LISP_POOL_CUR < AO_LISP_POOL) {
 			AO_LISP_POOL_CUR += AO_LISP_POOL / 8;
 			ao_lisp_poison();
 		} else
 #endif
 		ao_lisp_collect();
-#ifdef DBG_POOL
+#ifdef MDBG_POOL
 		{
 			int	i;
 
@@ -454,7 +564,7 @@ ao_lisp_alloc(int size)
 #endif
 
 		if (ao_lisp_top + size > AO_LISP_POOL) {
-			ao_lisp_exception |= AO_LISP_OOM;
+			ao_lisp_error(AO_LISP_OOM, "out of memory");
 			return NULL;
 		}
 	}
@@ -467,7 +577,7 @@ int
 ao_lisp_root_add(const struct ao_lisp_type *type, void *addr)
 {
 	int	i;
-	DBG("add root type %p addr %p\n", type, addr);
+	MDBG("add root type %p addr %p\n", type, addr);
 	for (i = 0; i < AO_LISP_ROOT; i++) {
 		if (!ao_lisp_root[i].addr) {
 			ao_lisp_root[i].addr = addr;
@@ -475,7 +585,7 @@ ao_lisp_root_add(const struct ao_lisp_type *type, void *addr)
 			return 1;
 		}
 	}
-	abort();
+	ao_lisp_abort();
 	return 0;
 }