X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=7cd8b5a5959ca29f3bcea8aeda154ba789325715;hb=577911241db454bc3129fc47566c6a55752c4182;hp=858212dd5012fc9659fce01dea1a8ba384a0f4f5;hpb=00bf2ca86b60e6501880011897cea073865c5a03;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index 858212dd..7cd8b5a5 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -92,12 +92,13 @@ extern uint8_t		ao_lisp_pool[AO_LISP_POOL + AO_LISP_POOL_EXTRA] __attribute__((a
 #define AO_LISP_ATOM		4
 #define AO_LISP_BUILTIN		5
 #define AO_LISP_FRAME		6
-#define AO_LISP_LAMBDA		7
-#define AO_LISP_STACK		8
-#define AO_LISP_BOOL		9
-#define AO_LISP_BIGINT		10
-#define AO_LISP_FLOAT		11
-#define AO_LISP_NUM_TYPE	12
+#define AO_LISP_FRAME_VALS	7
+#define AO_LISP_LAMBDA		8
+#define AO_LISP_STACK		9
+#define AO_LISP_BOOL		10
+#define AO_LISP_BIGINT		11
+#define AO_LISP_FLOAT		12
+#define AO_LISP_NUM_TYPE	13
 
 /* Leave two bits for types to use as they please */
 #define AO_LISP_OTHER_TYPE_MASK	0x3f
@@ -110,8 +111,9 @@ extern uint16_t		ao_lisp_top;
 #define AO_LISP_DIVIDE_BY_ZERO	0x02
 #define AO_LISP_INVALID		0x04
 #define AO_LISP_UNDEFINED	0x08
-#define AO_LISP_EOF		0x10
-#define AO_LISP_EXIT		0x20
+#define AO_LISP_REDEFINED	0x10
+#define AO_LISP_EOF		0x20
+#define AO_LISP_EXIT		0x40
 
 extern uint8_t		ao_lisp_exception;
 
@@ -154,11 +156,17 @@ struct ao_lisp_val {
 	ao_poly		val;
 };
 
+struct ao_lisp_frame_vals {
+	uint8_t			type;
+	uint8_t			size;
+	struct ao_lisp_val	vals[];
+};
+
 struct ao_lisp_frame {
 	uint8_t			type;
 	uint8_t			num;
 	ao_poly			prev;
-	struct ao_lisp_val	vals[];
+	ao_poly			vals;
 };
 
 struct ao_lisp_bool {
@@ -200,6 +208,8 @@ ao_lisp_bigint_int(uint32_t bi) {
 
 #define AO_LISP_MIN_INT		(-(1 << (15 - AO_LISP_TYPE_SHIFT)))
 #define AO_LISP_MAX_INT		((1 << (15 - AO_LISP_TYPE_SHIFT)) - 1)
+#define AO_LISP_MIN_BIGINT	(-(1 << 24))
+#define AO_LISP_MAX_BIGINT	((1 << 24) - 1)
 
 #define AO_LISP_NOT_INTEGER	0x7fffffff
 
@@ -221,6 +231,16 @@ ao_lisp_frame_poly(struct ao_lisp_frame *frame) {
 	return ao_lisp_poly(frame, AO_LISP_OTHER);
 }
 
+static inline struct ao_lisp_frame_vals *
+ao_lisp_poly_frame_vals(ao_poly poly) {
+	return ao_lisp_ref(poly);
+}
+
+static inline ao_poly
+ao_lisp_frame_vals_poly(struct ao_lisp_frame_vals *vals) {
+	return ao_lisp_poly(vals, AO_LISP_OTHER);
+}
+
 enum eval_state {
 	eval_sexpr,		/* Evaluate an sexpr */
 	eval_val,		/* Value computed */
@@ -528,6 +548,12 @@ ao_lisp_stack_fetch(int id) {
 	return ao_lisp_poly_stack(ao_lisp_poly_fetch(id));
 }
 
+void
+ao_lisp_frame_stash(int id, struct ao_lisp_frame *frame);
+
+struct ao_lisp_frame *
+ao_lisp_frame_fetch(int id);
+
 /* bool */
 
 extern const struct ao_lisp_type ao_lisp_bool_type;
@@ -604,7 +630,7 @@ 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_lisp_atom_ref(ao_poly atom);
 
 ao_poly
 ao_lisp_atom_get(ao_poly atom);
@@ -612,6 +638,9 @@ ao_lisp_atom_get(ao_poly atom);
 ao_poly
 ao_lisp_atom_set(ao_poly atom, ao_poly val);
 
+ao_poly
+ao_lisp_atom_def(ao_poly atom, ao_poly val);
+
 /* int */
 void
 ao_lisp_int_write(ao_poly i);
@@ -713,6 +742,7 @@ ao_lisp_read_eval_print(void);
 
 /* frame */
 extern const struct ao_lisp_type ao_lisp_frame_type;
+extern const struct ao_lisp_type ao_lisp_frame_vals_type;
 
 #define AO_LISP_FRAME_FREE	6
 
@@ -733,12 +763,15 @@ ao_lisp_frame_free(struct ao_lisp_frame *frame);
 void
 ao_lisp_frame_bind(struct ao_lisp_frame *frame, int num, ao_poly atom, ao_poly val);
 
-int
-ao_lisp_frame_add(struct ao_lisp_frame **frame, ao_poly atom, ao_poly val);
+ao_poly
+ao_lisp_frame_add(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val);
 
 void
 ao_lisp_frame_write(ao_poly p);
 
+void
+ao_lisp_frame_init(void);
+
 /* lambda */
 extern const struct ao_lisp_type ao_lisp_lambda_type;
 
@@ -840,7 +873,7 @@ ao_lisp_frames_dump(void)
 #include <assert.h>
 extern int dbg_move_depth;
 #define MDBG_DUMP 1
-#define MDBG_OFFSET(a)	((int) ((uint8_t *) (a) - ao_lisp_pool))
+#define MDBG_OFFSET(a)	((a) ? (int) ((uint8_t *) (a) - ao_lisp_pool) : -1)
 
 extern int dbg_mem;