X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=bcb0a17fa7dfd8ba102d52f295b0e79abe5a97fc;hb=ac0f7768659e288338bf452b4248ae3572ea2f7d;hp=ea3d2a0905f8d5e8e9deab93523404f3bd0ecb61;hpb=33aeffc123af1f9063969acf585f1caac885ced4;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index ea3d2a09..bcb0a17f 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -134,6 +134,7 @@ struct ao_lisp_type {
 	int	(*size)(void *addr);
 	void	(*mark)(void *addr);
 	void	(*move)(void *addr);
+	char	name[];
 };
 
 struct ao_lisp_cons {
@@ -155,13 +156,33 @@ struct ao_lisp_val {
 
 struct ao_lisp_frame {
 	uint8_t			type;
-	uint8_t			num;
-	ao_poly			next;
+	uint8_t			_num;
+	ao_poly			prev;
 	struct ao_lisp_val	vals[];
 };
 
+#define AO_LISP_FRAME_NUM_MASK	0x7f
+
+/* Set when the frame escapes the lambda */
+#define AO_LISP_FRAME_MARK	0x80
+
+static inline int ao_lisp_frame_num(struct ao_lisp_frame *f) {
+	if (f->_num == 0xff)
+		ao_lisp_abort();
+	return f->_num & AO_LISP_FRAME_NUM_MASK;
+}
+
+static inline int ao_lisp_frame_marked(struct ao_lisp_frame *f) {
+	if (f->_num == 0xff)
+		ao_lisp_abort();
+	return f->_num & AO_LISP_FRAME_MARK;
+}
+
 static inline struct ao_lisp_frame *
 ao_lisp_poly_frame(ao_poly poly) {
+	struct ao_lisp_frame *frame = ao_lisp_ref(poly);
+	if (frame && frame->_num == 0xff)
+		ao_lisp_abort();
 	return ao_lisp_ref(poly);
 }
 
@@ -172,14 +193,15 @@ ao_lisp_frame_poly(struct ao_lisp_frame *frame) {
 
 enum eval_state {
 	eval_sexpr,		/* Evaluate an sexpr */
-	eval_val,
-	eval_formal,
-	eval_exec,
-	eval_cond,
-	eval_cond_test,
-	eval_progn,
-	eval_while,
-	eval_while_test,
+	eval_val,		/* Value computed */
+	eval_formal,		/* Formal computed */
+	eval_exec,		/* Start a lambda evaluation */
+	eval_cond,		/* Start next cond clause */
+	eval_cond_test,		/* Check cond condition */
+	eval_progn,		/* Start next progn entry */
+	eval_while,		/* Start while condition */
+	eval_while_test,	/* Check while condition */
+	eval_macro,		/* Finished with macro generation */
 };
 
 struct ao_lisp_stack {
@@ -205,6 +227,7 @@ ao_lisp_stack_poly(struct ao_lisp_stack *stack)
 }
 
 extern struct ao_lisp_stack	*ao_lisp_stack;
+extern struct ao_lisp_stack	*ao_lisp_stack_free_list;
 extern ao_poly			ao_lisp_v;
 
 #define AO_LISP_FUNC_LAMBDA	0
@@ -212,6 +235,14 @@ extern ao_poly			ao_lisp_v;
 #define AO_LISP_FUNC_MACRO	2
 #define AO_LISP_FUNC_LEXPR	3
 
+#define AO_LISP_FUNC_FREE_ARGS	0x80
+#define AO_LISP_FUNC_MASK	0x7f
+
+#define AO_LISP_FUNC_F_LAMBDA	(AO_LISP_FUNC_FREE_ARGS | AO_LISP_FUNC_LAMBDA)
+#define AO_LISP_FUNC_F_NLAMBDA	(AO_LISP_FUNC_FREE_ARGS | AO_LISP_FUNC_NLAMBDA)
+#define AO_LISP_FUNC_F_MACRO	(AO_LISP_FUNC_FREE_ARGS | AO_LISP_FUNC_MACRO)
+#define AO_LISP_FUNC_F_LEXPR	(AO_LISP_FUNC_FREE_ARGS | AO_LISP_FUNC_LEXPR)
+
 struct ao_lisp_builtin {
 	uint8_t		type;
 	uint8_t		args;
@@ -304,11 +335,17 @@ ao_lisp_other_poly(const void *other)
 }
 
 static inline int
-ao_lisp_mem_round(int size)
+ao_lisp_size_round(int size)
 {
 	return (size + 3) & ~3;
 }
 
+static inline int
+ao_lisp_size(const struct ao_lisp_type *type, void *addr)
+{
+	return ao_lisp_size_round(type->size(addr));
+}
+
 #define AO_LISP_OTHER_POLY(other) ((ao_poly)(other) + AO_LISP_OTHER)
 
 static inline int ao_lisp_poly_base_type(ao_poly poly) {
@@ -383,13 +420,16 @@ ao_lisp_builtin_poly(struct ao_lisp_builtin *b)
 }
 
 /* memory functions */
+
+extern int ao_lisp_collects;
+
 /* returns 1 if the object was already marked */
 int
 ao_lisp_mark(const struct ao_lisp_type *type, void *addr);
 
 /* returns 1 if the object was already marked */
 int
-ao_lisp_mark_memory(void *addr, int size);
+ao_lisp_mark_memory(const struct ao_lisp_type *type, void *addr);
 
 void *
 ao_lisp_move_map(void *addr);
@@ -400,7 +440,7 @@ ao_lisp_move(const struct ao_lisp_type *type, void **ref);
 
 /* returns 1 if the object was already moved */
 int
-ao_lisp_move_memory(void **ref, int size);
+ao_lisp_move_memory(const struct ao_lisp_type *type, void **ref);
 
 void *
 ao_lisp_alloc(int size);
@@ -408,14 +448,23 @@ ao_lisp_alloc(int size);
 void
 ao_lisp_collect(void);
 
-int
-ao_lisp_root_add(const struct ao_lisp_type *type, void *addr);
+void
+ao_lisp_cons_stash(int id, struct ao_lisp_cons *cons);
 
-int
-ao_lisp_root_poly_add(ao_poly *p);
+struct ao_lisp_cons *
+ao_lisp_cons_fetch(int id);
+
+void
+ao_lisp_string_stash(int id, char *string);
+
+char *
+ao_lisp_string_fetch(int id);
 
 void
-ao_lisp_root_clear(void *addr);
+ao_lisp_poly_stash(int id, ao_poly poly);
+
+ao_poly
+ao_lisp_poly_fetch(int id);
 
 /* cons */
 extern const struct ao_lisp_type ao_lisp_cons_type;
@@ -423,6 +472,11 @@ extern const struct ao_lisp_type ao_lisp_cons_type;
 struct ao_lisp_cons *
 ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr);
 
+extern struct ao_lisp_cons *ao_lisp_cons_free_list;
+
+void
+ao_lisp_cons_free(struct ao_lisp_cons *cons);
+
 void
 ao_lisp_cons_print(ao_poly);
 
@@ -435,9 +489,6 @@ ao_lisp_cons_length(struct ao_lisp_cons *cons);
 /* string */
 extern const struct ao_lisp_type ao_lisp_string_type;
 
-char *
-ao_lisp_string_new(int len);
-
 char *
 ao_lisp_string_copy(char *a);
 
@@ -469,6 +520,9 @@ ao_lisp_atom_print(ao_poly a);
 struct ao_lisp_atom *
 ao_lisp_atom_intern(char *name);
 
+ao_poly *
+ao_lisp_atom_ref(struct ao_lisp_frame *frame, ao_poly atom);
+
 ao_poly
 ao_lisp_atom_get(ao_poly atom);
 
@@ -529,6 +583,10 @@ char *
 ao_lisp_args_name(uint8_t args);
 
 /* read */
+extern struct ao_lisp_cons	*ao_lisp_read_cons;
+extern struct ao_lisp_cons	*ao_lisp_read_cons_tail;
+extern struct ao_lisp_cons	*ao_lisp_read_stack;
+
 ao_poly
 ao_lisp_read(void);
 
@@ -539,12 +597,22 @@ ao_lisp_read_eval_print(void);
 /* frame */
 extern const struct ao_lisp_type ao_lisp_frame_type;
 
+#define AO_LISP_FRAME_FREE	4
+
+extern struct ao_lisp_frame	*ao_lisp_frame_free_list[AO_LISP_FRAME_FREE];
+
+ao_poly
+ao_lisp_frame_mark(struct ao_lisp_frame *frame);
+
 ao_poly *
 ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom);
 
 struct ao_lisp_frame *
 ao_lisp_frame_new(int num);
 
+void
+ao_lisp_frame_free(struct ao_lisp_frame *frame);
+
 int
 ao_lisp_frame_add(struct ao_lisp_frame **frame, ao_poly atom, ao_poly val);
 
@@ -585,6 +653,8 @@ ao_lisp_restore(struct ao_lisp_cons *cons);
 
 /* error */
 
+extern const struct ao_lisp_type ao_lisp_stack_type;
+
 void
 ao_lisp_stack_print(void);
 
@@ -631,4 +701,32 @@ ao_lisp_frames_dump(void)
 #define DBG_FRAMES()
 #endif
 
+#define DBG_MEM		0
+#define DBG_MEM_START	1
+
+#if DBG_MEM
+
+#include <assert.h>
+extern int dbg_move_depth;
+#define MDBG_DUMP 1
+#define MDBG_OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_pool))
+
+extern int dbg_mem;
+
+#define MDBG_DO(a)	a
+#define MDBG_MOVE(...) do { if (dbg_mem) { int d; for (d = 0; d < dbg_move_depth; d++) printf ("  "); printf(__VA_ARGS__); } } while (0)
+#define MDBG_MORE(...) do { if (dbg_mem) printf(__VA_ARGS__); } while (0)
+#define MDBG_MOVE_IN()	(dbg_move_depth++)
+#define MDBG_MOVE_OUT()	(assert(--dbg_move_depth >= 0))
+
+#else
+
+#define MDBG_DO(a)
+#define MDBG_MOVE(...)
+#define MDBG_MORE(...)
+#define MDBG_MOVE_IN()
+#define MDBG_MOVE_OUT()
+
+#endif
+
 #endif /* _AO_LISP_H_ */