altos/lisp: Clean up OS integration bits, add defun

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

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index 6a35d8ce3f0493104e4dd683a2762bb3f7dd654e..de55b3076888fed40047df96735033510ed4c6fa 100644 (file)
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -15,17 +15,10 @@
 #ifndef _AO_LISP_H_
 #define _AO_LISP_H_
 
-#include <stdlib.h>
-
-#if !defined(AO_LISP_TEST) && !defined(AO_LISP_MAKE_CONST)
-#include <ao.h>
-#define AO_LISP_ALTOS  1
-#define abort() ao_panic(1)
-#endif
-
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
+//#include <stdio.h>
+#include <ao_lisp_os.h>
 
 #ifdef AO_LISP_MAKE_CONST
 #define AO_LISP_POOL_CONST     16384
@@ -45,6 +38,8 @@ extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
 #define _ao_lisp_atom_last     _atom("last")
 #define _ao_lisp_atom_cond     _atom("cond")
 #define _ao_lisp_atom_lambda   _atom("lambda")
+#define _ao_lisp_atom_led      _atom("led")
+#define _ao_lisp_atom_delay    _atom("delay")
 #else
 #include "ao_lisp_const.h"
 #ifndef AO_LISP_POOL
@@ -78,6 +73,7 @@ extern uint16_t               ao_lisp_top;
 #define AO_LISP_OOM            0x01
 #define AO_LISP_DIVIDE_BY_ZERO 0x02
 #define AO_LISP_INVALID                0x04
+#define AO_LISP_UNDEFINED      0x08
 
 extern uint8_t         ao_lisp_exception;
 
@@ -98,7 +94,7 @@ ao_lisp_is_const(ao_poly poly) {
 static inline void *
 ao_lisp_ref(ao_poly poly) {
        if (poly == 0xBEEF)
-               abort();
+               ao_lisp_abort();
        if (poly == AO_LISP_NIL)
                return NULL;
        if (poly & AO_LISP_CONST)
@@ -156,28 +152,25 @@ ao_lisp_frame_poly(struct ao_lisp_frame *frame) {
        return ao_lisp_poly(frame, AO_LISP_OTHER);
 }
 
-struct ao_lisp_stack {
-       ao_poly                 prev;
-       uint8_t                 state;
-       uint8_t                 macro;
-       ao_poly                 sexprs;
-       ao_poly                 values;
-       ao_poly                 values_tail;
-       ao_poly                 frame;
-       ao_poly                 macro_frame;
-       ao_poly                 list;
-};
-
 enum eval_state {
-       eval_sexpr,
+       eval_sexpr,             /* Evaluate an sexpr */
        eval_val,
        eval_formal,
        eval_exec,
-       eval_lambda_done,
        eval_cond,
        eval_cond_test
 };
 
+struct ao_lisp_stack {
+       uint8_t                 state;          /* enum eval_state */
+       ao_poly                 prev;           /* previous stack frame */
+       ao_poly                 sexprs;         /* expressions to evaluate */
+       ao_poly                 values;         /* values computed */
+       ao_poly                 values_tail;    /* end of the values list for easy appending */
+       ao_poly                 frame;          /* current lookup frame */
+       ao_poly                 list;           /* most recent function call */
+};
+
 static inline struct ao_lisp_stack *
 ao_lisp_poly_stack(ao_poly p)
 {
@@ -229,12 +222,14 @@ enum ao_lisp_builtin_id {
        builtin_greater,
        builtin_less_equal,
        builtin_greater_equal,
+       builtin_delay,
+       builtin_led,
        _builtin_last
 };
 
 typedef ao_poly (*ao_lisp_func_t)(struct ao_lisp_cons *cons);
 
-extern ao_lisp_func_t  ao_lisp_builtins[];
+extern const ao_lisp_func_t    ao_lisp_builtins[];
 
 static inline ao_lisp_func_t
 ao_lisp_func(struct ao_lisp_builtin *b)
@@ -559,6 +554,16 @@ int ao_lisp_stack_depth;
 #define DBG_POLY(a)    ao_lisp_poly_print(a)
 #define OFFSET(a)      ((a) ? (int) ((uint8_t *) a - ao_lisp_pool) : -1)
 #define DBG_STACK()    ao_lisp_stack_print()
+static inline void
+ao_lisp_frames_dump(void)
+{
+       struct ao_lisp_stack *s;
+       DBGI(".. current frame: "); DBG_POLY(ao_lisp_frame_poly(ao_lisp_frame_current)); DBG("\n");
+       for (s = ao_lisp_stack; s; s = ao_lisp_poly_stack(s->prev)) {
+               DBGI(".. stack frame: "); DBG_POLY(s->frame); DBG("\n");
+       }
+}
+#define DBG_FRAMES()   ao_lisp_frames_dump()
 #else
 #define DBG_DO(a)
 #define DBG_INDENT()
@@ -570,6 +575,7 @@ int ao_lisp_stack_depth;
 #define DBG_POLY(a)
 #define DBG_RESET()
 #define DBG_STACK()
+#define DBG_FRAMES()
 #endif
 
 #endif /* _AO_LISP_H_ */