altos/lisp: Change GC move API

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

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index 98e99acbaec768d4467521f946f19f9741a0be3e..27174e131997e06286eaab71ba6d13824a37827c 100644 (file)
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -32,11 +32,22 @@
 extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
 #define ao_lisp_pool ao_lisp_const
 #define AO_LISP_POOL AO_LISP_POOL_CONST
-#define _ao_lisp_atom_quote ao_lisp_atom_poly(ao_lisp_atom_intern("quote"))
-#define _ao_lisp_atom_set ao_lisp_atom_poly(ao_lisp_atom_intern("set"))
+
+#define _atom(n) ao_lisp_atom_poly(ao_lisp_atom_intern(n))
+
+#define _ao_lisp_atom_quote    _atom("quote")
+#define _ao_lisp_atom_set      _atom("set")
+#define _ao_lisp_atom_setq     _atom("setq")
+#define _ao_lisp_atom_t        _atom("t")
+#define _ao_lisp_atom_car      _atom("car")
+#define _ao_lisp_atom_cdr      _atom("cdr")
+#define _ao_lisp_atom_cons     _atom("cons")
+#define _ao_lisp_atom_cond     _atom("cond")
 #else
 #include "ao_lisp_const.h"
-#define AO_LISP_POOL   1024
+#ifndef AO_LISP_POOL
+#define AO_LISP_POOL   16384
+#endif
 extern uint8_t         ao_lisp_pool[AO_LISP_POOL];
 #endif
 
@@ -68,6 +79,7 @@ extern uint16_t               ao_lisp_top;
 extern uint8_t         ao_lisp_exception;
 
 typedef uint16_t       ao_poly;
+typedef int16_t                ao_signed_poly;
 
 static inline int
 ao_lisp_is_const(ao_poly poly) {
@@ -82,6 +94,8 @@ ao_lisp_is_const(ao_poly poly) {
 
 static inline void *
 ao_lisp_ref(ao_poly poly) {
+       if (poly == 0xBEEF)
+               abort();
        if (poly == AO_LISP_NIL)
                return NULL;
        if (poly & AO_LISP_CONST)
@@ -123,8 +137,8 @@ struct ao_lisp_val {
 };
 
 struct ao_lisp_frame {
+       uint8_t                 type;
        uint8_t                 num;
-       uint8_t                 readonly;
        ao_poly                 next;
        struct ao_lisp_val      vals[];
 };
@@ -157,12 +171,18 @@ enum ao_lisp_builtin_id {
        builtin_quote,
        builtin_set,
        builtin_setq,
+       builtin_cond,
        builtin_print,
        builtin_plus,
        builtin_minus,
        builtin_times,
        builtin_divide,
        builtin_mod,
+       builtin_equal,
+       builtin_less,
+       builtin_greater,
+       builtin_less_equal,
+       builtin_greater_equal,
        builtin_last
 };
 
@@ -222,13 +242,13 @@ ao_lisp_cons_poly(struct ao_lisp_cons *cons)
 static inline int
 ao_lisp_poly_int(ao_poly poly)
 {
-       return (int) poly >> AO_LISP_TYPE_SHIFT;
+       return (int) ((ao_signed_poly) poly >> AO_LISP_TYPE_SHIFT);
 }
 
 static inline ao_poly
 ao_lisp_int_poly(int i)
 {
-       return ((ao_poly) i << 2) + AO_LISP_INT;
+       return ((ao_poly) i << 2) | AO_LISP_INT;
 }
 
 static inline char *
@@ -268,7 +288,8 @@ ao_lisp_builtin_poly(struct ao_lisp_builtin *b)
 }
 
 /* memory functions */
-void
+/* 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 */
@@ -278,12 +299,13 @@ ao_lisp_mark_memory(void *addr, int size);
 void *
 ao_lisp_move_map(void *addr);
 
-void *
-ao_lisp_move(const struct ao_lisp_type *type, void *addr);
+/* returns 1 if the object was already moved */
+int
+ao_lisp_move(const struct ao_lisp_type *type, void **ref);
 
-/* returns NULL if the object was already moved */
-void *
-ao_lisp_move_memory(void *addr, int size);
+/* returns 1 if the object was already moved */
+int
+ao_lisp_move_memory(void **ref, int size);
 
 void *
 ao_lisp_alloc(int size);
@@ -294,6 +316,9 @@ ao_lisp_collect(void);
 int
 ao_lisp_root_add(const struct ao_lisp_type *type, void *addr);
 
+int
+ao_lisp_root_poly_add(ao_poly *p);
+
 void
 ao_lisp_root_clear(void *addr);
 
@@ -326,8 +351,7 @@ extern const struct ao_lisp_type ao_lisp_atom_type;
 
 extern struct ao_lisp_atom *ao_lisp_atoms;
 
-void
-ao_lisp_atom_init(void);
+extern struct ao_lisp_frame *ao_lisp_frame_current;
 
 void
 ao_lisp_atom_print(ao_poly a);
@@ -349,22 +373,39 @@ ao_lisp_int_print(ao_poly i);
 ao_poly
 ao_lisp_poly_print(ao_poly p);
 
-void
+int
 ao_lisp_poly_mark(ao_poly p);
 
-ao_poly
-ao_lisp_poly_move(ao_poly p);
+/* returns 1 if the object has already been moved */
+int
+ao_lisp_poly_move(ao_poly *p);
 
 /* eval */
+
 ao_poly
 ao_lisp_eval(ao_poly p);
 
+ao_poly
+ao_lisp_set_cond(struct ao_lisp_cons *cons);
+
 /* builtin */
 void
 ao_lisp_builtin_print(ao_poly b);
 
 extern const struct ao_lisp_type ao_lisp_builtin_type;
 
+/* Check argument count */
+ao_poly
+ao_lisp_check_argc(ao_poly name, struct ao_lisp_cons *cons, int min, int max);
+
+/* Check argument type */
+ao_poly
+ao_lisp_check_argt(ao_poly name, struct ao_lisp_cons *cons, int argc, int type, int nil_ok);
+
+/* Fetch an arg (nil if off the end) */
+ao_poly
+ao_lisp_arg(struct ao_lisp_cons *cons, int argc);
+
 /* read */
 ao_poly
 ao_lisp_read(void);
@@ -376,16 +417,18 @@ ao_lisp_read_eval_print(void);
 /* frame */
 extern const struct ao_lisp_type ao_lisp_frame_type;
 
-int
-ao_lisp_frame_set(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val);
-
-ao_poly
-ao_lisp_frame_get(struct ao_lisp_frame *frame, ao_poly atom);
+ao_poly *
+ao_lisp_frame_ref(struct ao_lisp_frame *frame, ao_poly atom);
 
 struct ao_lisp_frame *
-ao_lisp_frame_new(int num, int readonly);
+ao_lisp_frame_new(int num);
 
 struct ao_lisp_frame *
 ao_lisp_frame_add(struct ao_lisp_frame *frame, ao_poly atom, ao_poly val);
 
+/* error */
+
+ao_poly
+ao_lisp_error(int error, char *format, ...);
+
 #endif /* _AO_LISP_H_ */