altos: Build TeleMega v3.0 by default

[fw/altos] / src / lisp / ao_lisp.h

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index cbbbe9a47ebf82fdf43b87ac5312a3f03fe9391b..1f3fb2b4020ebfec98e6c6391d17cfa761488d70 100644 (file)
--- 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 {
@@ -221,6 +229,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 */
@@ -229,7 +247,7 @@ enum eval_state {
        eval_apply,             /* Execute apply */
        eval_cond,              /* Start next cond clause */
        eval_cond_test,         /* Check cond condition */
-       eval_progn,             /* Start next progn entry */
+       eval_begin,             /* Start next begin entry */
        eval_while,             /* Start while condition */
        eval_while_test,        /* Check while condition */
        eval_macro,             /* Finished with macro generation */
@@ -528,6 +546,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 +628,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 +636,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 +740,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 +761,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 +871,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;