X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=a8e1715a8dc88bd3ca8cc4e79e5823b4b3561efc;hb=e600fc409c577eec02af612a36431c477a9c875e;hp=bcb0a17fa7dfd8ba102d52f295b0e79abe5a97fc;hpb=881161fe1c5fb0e2b1220c30572eb2c45bedbafe;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index bcb0a17f..a8e1715a 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -75,6 +75,7 @@ extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
 #define _ao_lisp_atom_eof	_atom("eof")
 #define _ao_lisp_atom_save	_atom("save")
 #define _ao_lisp_atom_restore	_atom("restore")
+#define _ao_lisp_atom_call2fcc	_atom("call/cc")
 #else
 #include "ao_lisp_const.h"
 #ifndef AO_LISP_POOL
@@ -99,7 +100,11 @@ extern uint8_t		ao_lisp_pool[AO_LISP_POOL + AO_LISP_POOL_EXTRA];
 #define AO_LISP_BUILTIN		5
 #define AO_LISP_FRAME		6
 #define AO_LISP_LAMBDA		7
-#define AO_LISP_NUM_TYPE	8
+#define AO_LISP_STACK		8
+#define AO_LISP_NUM_TYPE	9
+
+/* Leave two bits for types to use as they please */
+#define AO_LISP_OTHER_TYPE_MASK	0x3f
 
 #define AO_LISP_NIL	0
 
@@ -118,9 +123,6 @@ ao_lisp_is_const(ao_poly poly) {
 	return poly & AO_LISP_CONST;
 }
 
-#define AO_LISP_POOL_BASE	(ao_lisp_pool - 4)
-#define AO_LISP_CONST_BASE	(ao_lisp_const - 4)
-
 #define AO_LISP_IS_CONST(a)	(ao_lisp_const <= ((uint8_t *) (a)) && ((uint8_t *) (a)) < ao_lisp_const + AO_LISP_POOL_CONST)
 #define AO_LISP_IS_POOL(a)	(ao_lisp_pool <= ((uint8_t *) (a)) && ((uint8_t *) (a)) < ao_lisp_pool + AO_LISP_POOL)
 
@@ -156,33 +158,21 @@ struct ao_lisp_val {
 
 struct ao_lisp_frame {
 	uint8_t			type;
-	uint8_t			_num;
+	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 */
+/* Set on type 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;
-}
+#define AO_LISP_FRAME_PRINT	0x40
 
 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;
+	return f->type & 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);
 }
 
@@ -205,6 +195,7 @@ enum eval_state {
 };
 
 struct ao_lisp_stack {
+	uint8_t			type;		/* AO_LISP_STACK */
 	uint8_t			state;		/* enum eval_state */
 	ao_poly			prev;		/* previous stack frame */
 	ao_poly			sexprs;		/* expressions to evaluate */
@@ -214,6 +205,17 @@ struct ao_lisp_stack {
 	ao_poly			list;		/* most recent function call */
 };
 
+#define AO_LISP_STACK_MARK	0x80	/* set on type when a reference has been taken */
+#define AO_LISP_STACK_PRINT	0x40	/* stack is being printed */
+
+static inline int ao_lisp_stack_marked(struct ao_lisp_stack *s) {
+	return s->type & AO_LISP_STACK_MARK;
+}
+
+static inline void ao_lisp_stack_mark(struct ao_lisp_stack *s) {
+	s->type |= AO_LISP_STACK_MARK;
+}
+
 static inline struct ao_lisp_stack *
 ao_lisp_poly_stack(ao_poly p)
 {
@@ -226,8 +228,6 @@ ao_lisp_stack_poly(struct ao_lisp_stack *stack)
 	return ao_lisp_poly(stack, AO_LISP_OTHER);
 }
 
-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
@@ -286,6 +286,7 @@ enum ao_lisp_builtin_id {
 	builtin_led,
 	builtin_save,
 	builtin_restore,
+	builtin_call_cc,
 	_builtin_last
 };
 
@@ -325,7 +326,7 @@ ao_lisp_poly_other(ao_poly poly) {
 
 static inline uint8_t
 ao_lisp_other_type(void *other) {
-	return *((uint8_t *) other);
+	return *((uint8_t *) other) & AO_LISP_OTHER_TYPE_MASK;
 }
 
 static inline ao_poly
@@ -421,7 +422,9 @@ ao_lisp_builtin_poly(struct ao_lisp_builtin *b)
 
 /* memory functions */
 
-extern int ao_lisp_collects;
+extern int ao_lisp_collects[2];
+extern int ao_lisp_freed[2];
+extern int ao_lisp_loops[2];
 
 /* returns 1 if the object was already marked */
 int
@@ -445,8 +448,11 @@ ao_lisp_move_memory(const struct ao_lisp_type *type, void **ref);
 void *
 ao_lisp_alloc(int size);
 
-void
-ao_lisp_collect(void);
+#define AO_LISP_COLLECT_FULL		1
+#define AO_LISP_COLLECT_INCREMENTAL	0
+
+int
+ao_lisp_collect(uint8_t style);
 
 void
 ao_lisp_cons_stash(int id, struct ao_lisp_cons *cons);
@@ -460,6 +466,12 @@ ao_lisp_string_stash(int id, char *string);
 char *
 ao_lisp_string_fetch(int id);
 
+void
+ao_lisp_stack_stash(int id, struct ao_lisp_stack *stack);
+
+struct ao_lisp_stack *
+ao_lisp_stack_fetch(int id);
+
 void
 ao_lisp_poly_stash(int id, ao_poly poly);
 
@@ -622,6 +634,8 @@ ao_lisp_frame_print(ao_poly p);
 /* lambda */
 extern const struct ao_lisp_type ao_lisp_lambda_type;
 
+extern const char *ao_lisp_state_names[];
+
 struct ao_lisp_lambda *
 ao_lisp_lambda_new(ao_poly cons);
 
@@ -651,12 +665,40 @@ ao_lisp_save(struct ao_lisp_cons *cons);
 ao_poly
 ao_lisp_restore(struct ao_lisp_cons *cons);
 
-/* error */
+/* stack */
 
 extern const struct ao_lisp_type ao_lisp_stack_type;
+extern struct ao_lisp_stack	*ao_lisp_stack;
+extern struct ao_lisp_stack	*ao_lisp_stack_free_list;
+
+void
+ao_lisp_stack_reset(struct ao_lisp_stack *stack);
+
+int
+ao_lisp_stack_push(void);
+
+void
+ao_lisp_stack_pop(void);
+
+void
+ao_lisp_stack_clear(void);
+
+void
+ao_lisp_stack_print(ao_poly stack);
+
+ao_poly
+ao_lisp_stack_eval(void);
+
+ao_poly
+ao_lisp_call_cc(struct ao_lisp_cons *cons);
+
+/* error */
+
+void
+ao_lisp_error_poly(char *name, ao_poly poly, ao_poly last);
 
 void
-ao_lisp_stack_print(void);
+ao_lisp_error_frame(int indent, char *name, struct ao_lisp_frame *frame);
 
 ao_poly
 ao_lisp_error(int error, char *format, ...);