X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_mem.c;h=c11ec25d96df982afa581549b5edc28d963b72b4;hb=b97b9f8199d1f65d2304b035c4f99b5a1c76f61b;hp=7295d1508967f4b4c95ff0abffa349037c2f4f7f;hpb=338723847e66f7c34a6b5e54d094ed52dc5665c3;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_mem.c b/src/lisp/ao_lisp_mem.c
index 7295d150..c11ec25d 100644
--- a/src/lisp/ao_lisp_mem.c
+++ b/src/lisp/ao_lisp_mem.c
@@ -17,11 +17,43 @@
 #include "ao_lisp.h"
 #include <stdio.h>
 
-uint8_t	ao_lisp_pool[AO_LISP_POOL] __attribute__((aligned(4)));
-
 #ifdef AO_LISP_MAKE_CONST
 #include <stdlib.h>
 uint8_t ao_lisp_const[AO_LISP_POOL_CONST] __attribute__((aligned(4)));
+#define ao_lisp_pool ao_lisp_const
+#undef AO_LISP_POOL
+#define AO_LISP_POOL AO_LISP_POOL_CONST
+#else
+uint8_t	ao_lisp_pool[AO_LISP_POOL] __attribute__((aligned(4)));
+#endif
+
+#if 0
+#define DBG_COLLECT_ALWAYS
+#endif
+
+#if 0
+#define DBG_POOL
+#endif
+
+#if 0
+#define DBG_INCLUDE
+#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 = 1;
+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--)
+#else
+#define DBG(...)
+#define DBG_DO(a)
+#define DBG_RESET()
+#define DBG_MOVE(...)
+#define DBG_MOVE_IN()
+#define DBG_MOVE_OUT()
 #endif
 
 uint8_t	ao_lisp_exception;
@@ -36,8 +68,10 @@ 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];
-
 static uint8_t	ao_lisp_moving[AO_LISP_POOL / 32];
+static uint8_t	ao_lisp_cons[AO_LISP_POOL / 32];
+static uint8_t	ao_lisp_cons_last[AO_LISP_POOL / 32];
+static uint8_t	ao_lisp_cons_noted;
 
 uint16_t	ao_lisp_top;
 
@@ -112,6 +146,34 @@ clear_object(uint8_t *tag, void *addr, int size) {
 	return 0;
 }
 
+static int
+busy_object(uint8_t *tag, void *addr) {
+	int	base;
+
+	if (!addr)
+		return 1;
+
+	if ((uint8_t *) addr < ao_lisp_pool || ao_lisp_pool + AO_LISP_POOL <= (uint8_t*) addr)
+		return 1;
+
+	base = (uint8_t *) addr - ao_lisp_pool;
+	base = limit(base);
+	if (busy(tag, base))
+		return 1;
+	return 0;
+}
+
+static void
+note_cons(void *addr)
+{
+	DBG_MOVE("note cons %d\n", DBG_OFFSET(addr));
+	if (AO_LISP_IS_POOL(addr)) {
+		ao_lisp_cons_noted = 1;
+		mark(ao_lisp_cons, (uint8_t *) addr - ao_lisp_pool);
+	}
+}
+
+
 static void	*move_old, *move_new;
 static int	move_size;
 
@@ -120,56 +182,199 @@ move_object(void)
 {
 	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));
-	for (i = 0; i < AO_LISP_ROOT; i++)
-		if (ao_lisp_root[i].addr) {
-			void *new;
-			new = ao_lisp_move(ao_lisp_root[i].type, *ao_lisp_root[i].addr);
-			if (new)
-				*ao_lisp_root[i].addr = new;
+	memset(ao_lisp_cons, '\0', sizeof (ao_lisp_cons));
+	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) {
+			void *addr = *ao_lisp_root[i].addr;
+			if (!addr)
+				continue;
+			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);
+			}
+		} else {
+			ao_poly p = *(ao_poly *) ao_lisp_root[i].addr;
+			if (!p)
+				continue;
+			if (!ao_lisp_poly_move((ao_poly *) ao_lisp_root[i].addr, 0)) {
+				DBG_MOVE("root poly move from %04x to %04x\n",
+					 p, *(ao_poly *) ao_lisp_root[i].addr);
+			}
 		}
+	}
+	while (ao_lisp_cons_noted) {
+		memcpy(ao_lisp_cons_last, ao_lisp_cons, sizeof (ao_lisp_cons));
+		memset(ao_lisp_cons, '\0', sizeof (ao_lisp_cons));
+		ao_lisp_cons_noted = 0;
+		for (i = 0; i < AO_LISP_POOL; i += 4) {
+			if (busy(ao_lisp_cons_last, i)) {
+				void *addr = ao_lisp_pool + i;
+				DBG_MOVE("cons %d\n", DBG_OFFSET(addr));
+				if (!ao_lisp_move(&ao_lisp_cons_type, &addr)) {
+					DBG_MOVE("cons moves from %p to %p\n",
+						 ao_lisp_pool + i, addr);
+				}
+			}
+		}
+	}
+	DBG_MOVE_OUT();
+	DBG_MOVE("move done\n");
 }
 
+#if DBG_DUMP
 static void
-collect(void)
+dump_busy(void)
 {
 	int	i;
+	printf("busy:");
+	for (i = 0; i < ao_lisp_top; i += 4) {
+		if ((i & 0xff) == 0)
+			printf("\n");
+		else if ((i & 0x1f) == 0)
+			printf(" ");
+		if (busy(ao_lisp_busy, i))
+			putchar('*');
+		else
+			putchar('-');
+	}
+	printf ("\n");
+}
+#define DUMP_BUSY()	dump_busy()
+#else
+#define DUMP_BUSY()
+#endif
+
+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,
+};
+
+
+static void
+ao_lisp_mark_busy(void)
+{
+	int i;
 
-	/* Mark */
 	memset(ao_lisp_busy, '\0', sizeof (ao_lisp_busy));
-	for (i = 0; i < AO_LISP_ROOT; i++)
-		if (ao_lisp_root[i].addr)
-			ao_lisp_mark(ao_lisp_root[i].type, *ao_lisp_root[i].addr);
+	memset(ao_lisp_cons, '\0', sizeof (ao_lisp_cons));
+	ao_lisp_cons_noted = 0;
+	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 %d\n", DBG_OFFSET(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 0x%04x\n", p);
+				ao_lisp_poly_mark(p, 0);
+			}
+		}
+	}
+	while (ao_lisp_cons_noted) {
+		memcpy(ao_lisp_cons_last, ao_lisp_cons, sizeof (ao_lisp_cons));
+		memset(ao_lisp_cons, '\0', sizeof (ao_lisp_cons));
+		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;
+				DBG("cons %d\n", DBG_OFFSET(v));
+				ao_lisp_mark(&ao_lisp_cons_type, v);
+			}
+		}
+	}
+}
+
+void
+ao_lisp_collect(void)
+{
+	int	i;
+	int	top;
+
+	DBG("collect\n");
+	/* Mark */
+	ao_lisp_mark_busy();
 
+	DUMP_BUSY();
 	/* Compact */
-	ao_lisp_top = 0;
-	for (i = 0; i < AO_LISP_POOL; i += 4) {
+	DBG("find first busy\n");
+	for (i = 0; i < ao_lisp_top; i += 4) {
 		if (!busy(ao_lisp_busy, i))
 			break;
 	}
-	ao_lisp_top = i;
-	while(i < AO_LISP_POOL) {
+	top = i;
+	while(i < ao_lisp_top) {
 		if (busy(ao_lisp_busy, i)) {
+			DBG("busy %d -> %d\n", i, top);
 			move_old = &ao_lisp_pool[i];
-			move_new = &ao_lisp_pool[ao_lisp_top];
+			move_new = &ao_lisp_pool[top];
 			move_size = 0;
 			move_object();
+			DBG("\tbusy size %d\n", move_size);
+			if (move_size == 0)
+				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, move_old)) {
+				clear_object(ao_lisp_cons, move_old, move_size);
+				mark_object(ao_lisp_cons, move_new, move_size);
+			}
 			i += move_size;
-			ao_lisp_top += move_size;
+			top += move_size;
+			DUMP_BUSY();
 		} else {
 			i += 4;
 		}
 	}
+	ao_lisp_top = top;
 }
 
 
-void
+int
 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)))
-		return;
+		return 1;
 	type->mark(addr);
+	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) {
+		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
@@ -178,66 +383,207 @@ ao_lisp_mark_memory(void *addr, int size)
 	return mark_object(ao_lisp_busy, addr, size);
 }
 
+/*
+ * After the object has been moved, we have to reference it
+ * in the new location. This is only relevant for ao_lisp_poly_move
+ * as it needs to fetch the type byte from the object, which
+ * may have been overwritten by the copy
+ */
+void *
+ao_lisp_move_map(void *addr)
+{
+	if (addr == move_old) {
+		if (busy_object(ao_lisp_moving, addr))
+			return move_new;
+	}
+	return addr;
+}
+
 static void *
 check_move(void *addr, int size)
 {
 	if (addr == move_old) {
-		memmove(move_new, move_old, size);
-		move_size = (size + 3) & ~3;
+		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);
+			memmove(move_new, move_old, size);
+			move_size = (size + 3) & ~3;
+		}
 		addr = move_new;
 	}
 	return addr;
 }
 
-void *
-ao_lisp_move(const struct ao_lisp_type *type, void *addr)
+int
+ao_lisp_move(const struct ao_lisp_type *type, void **ref)
 {
-	int	size = type->size(addr);
+	void		*addr = *ref;
+	uint8_t		*a = addr;
+	int		size = type->size(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 (!AO_LISP_IS_POOL(a))
+		abort();
+	DBG_MOVE_IN();
 	addr = check_move(addr, size);
-	if (mark_object(ao_lisp_moving, addr, size))
-		return addr;
+	if (addr != *ref)
+		*ref = addr;
+	if (mark_object(ao_lisp_moving, addr, size)) {
+		DBG_MOVE("already moved\n");
+		DBG_MOVE_OUT();
+		return 1;
+	}
+	DBG_MOVE_OUT();
+	DBG_MOVE("recursing...\n");
+	DBG_MOVE_IN();
 	type->move(addr);
-	return addr;
+	DBG_MOVE_OUT();
+	DBG_MOVE("done %d\n", DBG_OFFSET(addr));
+	return 0;
 }
 
-void *
-ao_lisp_move_memory(void *addr, int size)
+int
+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();
 	addr = check_move(addr, size);
-	if (mark_object(ao_lisp_moving, addr, size))
-		return NULL;
-	return addr;
+	if (addr != *ref)
+		*ref = addr;
+	if (mark_object(ao_lisp_moving, addr, size)) {
+		DBG_MOVE("already moved\n");
+		DBG_MOVE_OUT();
+		return 1;
+	}
+	DBG_MOVE_OUT();
+	return 0;
 }
 
+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 (type == AO_LISP_CONS && do_note_cons) {
+		note_cons(addr);
+		addr = check_move(addr, sizeof (struct ao_lisp_cons));
+		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)
+			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);
+		DBG("poly %d moved %04x -> %04x\n",
+		    type, p, np);
+		*ref = np;
+	}
+	return ret;
+}
+
+#ifdef DBG_POOL
+static int AO_LISP_POOL_CUR = AO_LISP_POOL / 8;
+
+static void
+ao_lisp_poison(void)
+{
+	int	i;
+
+	printf("poison\n");
+	ao_lisp_mark_busy();
+	for (i = 0; i < AO_LISP_POOL_CUR; i += 4) {
+		uint32_t	*a = (uint32_t *) &ao_lisp_pool[i];
+		if (!busy_object(ao_lisp_busy, a))
+			*a = 0xBEEFBEEF;
+	}
+	for (i = 0; i < AO_LISP_POOL_CUR; i += 2) {
+		ao_poly		*a = (uint16_t *) &ao_lisp_pool[i];
+		ao_poly		p = *a;
+
+		if (!ao_lisp_is_const(p)) {
+			void	*r = ao_lisp_ref(p);
+
+			if (ao_lisp_pool <= (uint8_t *) r &&
+			    (uint8_t *) r <= ao_lisp_pool + AO_LISP_POOL_CUR)
+			{
+				if (!busy_object(ao_lisp_busy, r)) {
+					printf("missing reference from %d to %d\n",
+					       (int) ((uint8_t *) a - ao_lisp_pool),
+					       (int) ((uint8_t *) r - ao_lisp_pool));
+				}
+			}
+		}
+	}
+}
+
+#else
+#define AO_LISP_POOL_CUR AO_LISP_POOL
+#endif
+
 void *
 ao_lisp_alloc(int size)
 {
 	void	*addr;
 
 	size = ao_lisp_mem_round(size);
-#ifdef AO_LISP_MAKE_CONST
-	if (ao_lisp_top + size > AO_LISP_POOL_CONST) {
-		fprintf(stderr, "Too much constant data, increase AO_LISP_POOL_CONST\n");
-		exit(1);
-	}
-	addr = ao_lisp_const + ao_lisp_top;
-#else
-	if (ao_lisp_top + size > AO_LISP_POOL) {
-		collect();
+#ifdef DBG_COLLECT_ALWAYS
+	ao_lisp_collect();
+#endif
+	if (ao_lisp_top + size > AO_LISP_POOL_CUR) {
+#ifdef DBG_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
+		{
+			int	i;
+
+			for (i = ao_lisp_top; i < AO_LISP_POOL; i += 4) {
+				uint32_t	*p = (uint32_t *) &ao_lisp_pool[i];
+				*p = 0xbeefbeef;
+			}
+		}
+#endif
+
 		if (ao_lisp_top + size > AO_LISP_POOL) {
 			ao_lisp_exception |= AO_LISP_OOM;
 			return NULL;
 		}
 	}
 	addr = ao_lisp_pool + ao_lisp_top;
-#endif
 	ao_lisp_top += size;
 	return addr;
 }
@@ -246,6 +592,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);
 	for (i = 0; i < AO_LISP_ROOT; i++) {
 		if (!ao_lisp_root[i].addr) {
 			ao_lisp_root[i].addr = addr;
@@ -253,9 +600,16 @@ ao_lisp_root_add(const struct ao_lisp_type *type, void *addr)
 			return 1;
 		}
 	}
+	abort();
 	return 0;
 }
 
+int
+ao_lisp_root_poly_add(ao_poly *p)
+{
+	return ao_lisp_root_add(NULL, p);
+}
+
 void
 ao_lisp_root_clear(void *addr)
 {