altos/lisp: more GC issues. add patom

Use global ao_lisp_stack instead of local stack so that gc
moves of that item work.

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 50 insertions, 11 deletions

diff --git a/src/lisp/ao_lisp_prim.c b/src/lisp/ao_lisp_prim.c
index 7f02505d..82386a83 100644
--- a/src/lisp/ao_lisp_prim.c
+++ b/src/lisp/ao_lisp_prim.c
@@ -20,21 +20,60 @@
 #define DBG(...)
 #endif
 
-static void (*const ao_lisp_print_funcs[AO_LISP_NUM_TYPE])(ao_poly) = {
-	[AO_LISP_CONS] = ao_lisp_cons_print,
-	[AO_LISP_STRING] = ao_lisp_string_print,
-	[AO_LISP_INT] = ao_lisp_int_print,
-	[AO_LISP_ATOM] = ao_lisp_atom_print,
-	[AO_LISP_BUILTIN] = ao_lisp_builtin_print
+struct ao_lisp_funcs {
+	void (*print)(ao_poly);
+	void (*patom)(ao_poly);
 };
 
-ao_poly
+static const struct ao_lisp_funcs ao_lisp_funcs[AO_LISP_NUM_TYPE] = {
+	[AO_LISP_CONS] = {
+		.print = ao_lisp_cons_print,
+		.patom = ao_lisp_cons_patom,
+	},
+	[AO_LISP_STRING] = {
+		.print = ao_lisp_string_print,
+		.patom = ao_lisp_string_patom,
+	},
+	[AO_LISP_INT] = {
+		.print = ao_lisp_int_print,
+		.patom = ao_lisp_int_print,
+	},
+	[AO_LISP_ATOM] = {
+		.print = ao_lisp_atom_print,
+		.patom = ao_lisp_atom_print,
+	},
+	[AO_LISP_BUILTIN] = {
+		.print = ao_lisp_builtin_print,
+		.patom = ao_lisp_builtin_print,
+	}
+};
+
+static const struct ao_lisp_funcs *
+funcs(ao_poly p)
+{
+	uint8_t	type = ao_lisp_poly_type(p);
+
+	if (type < AO_LISP_NUM_TYPE)
+		return &ao_lisp_funcs[type];
+	return NULL;
+}
+
+void
 ao_lisp_poly_print(ao_poly p)
 {
-	void (*print)(ao_poly) = ao_lisp_print_funcs[ao_lisp_poly_type(p)];
-	if (print)
-		print(p);
-	return p;
+	const struct ao_lisp_funcs *f = funcs(p);
+
+	if (f && f->print)
+		f->print(p);
+}
+
+void
+ao_lisp_poly_patom(ao_poly p)
+{
+	const struct ao_lisp_funcs *f = funcs(p);
+
+	if (f && f->patom)
+		f->patom(p);
 }
 
 static const struct ao_lisp_type const *ao_lisp_types[AO_LISP_NUM_TYPE] = {