#ifndef _AO_LISP_H_
#define _AO_LISP_H_
+#define DBG_MEM 0
+#define DBG_EVAL 0
+
#include <stdint.h>
#include <string.h>
-//#include <stdio.h>
#include <ao_lisp_os.h>
typedef uint16_t ao_poly;
#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")
+#define _ao_lisp_atom_collect _atom("collect")
#else
#include "ao_lisp_const.h"
#ifndef AO_LISP_POOL
#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
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)
+#define AO_LISP_IS_INT(p) (ao_lisp_base_type(p) == AO_LISP_INT);
void *
ao_lisp_ref(ao_poly poly);
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);
}
};
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 */
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)
{
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
builtin_led,
builtin_save,
builtin_restore,
+ builtin_call_cc,
+ builtin_collect,
_builtin_last
};
static inline uint8_t
ao_lisp_other_type(void *other) {
- return *((uint8_t *) other);
+#if DBG_MEM
+ if ((*((uint8_t *) other) & AO_LISP_OTHER_TYPE_MASK) >= AO_LISP_NUM_TYPE)
+ ao_lisp_abort();
+#endif
+ return *((uint8_t *) other) & AO_LISP_OTHER_TYPE_MASK;
}
static inline ao_poly
struct ao_lisp_cons *
ao_lisp_cons_fetch(int id);
+void
+ao_lisp_poly_stash(int id, ao_poly poly);
+
+ao_poly
+ao_lisp_poly_fetch(int id);
+
void
ao_lisp_string_stash(int id, char *string);
char *
ao_lisp_string_fetch(int id);
-void
-ao_lisp_poly_stash(int id, ao_poly poly);
+static inline void
+ao_lisp_stack_stash(int id, struct ao_lisp_stack *stack) {
+ ao_lisp_poly_stash(id, ao_lisp_stack_poly(stack));
+}
-ao_poly
-ao_lisp_poly_fetch(int id);
+static inline struct ao_lisp_stack *
+ao_lisp_stack_fetch(int id) {
+ return ao_lisp_poly_stack(ao_lisp_poly_fetch(id));
+}
/* cons */
extern const struct ao_lisp_type ao_lisp_cons_type;
/* frame */
extern const struct ao_lisp_type ao_lisp_frame_type;
-#define AO_LISP_FRAME_FREE 4
+#define AO_LISP_FRAME_FREE 6
extern struct ao_lisp_frame *ao_lisp_frame_free_list[AO_LISP_FRAME_FREE];
void
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);
/* 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);
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_print(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_error_frame(int indent, char *name, struct ao_lisp_frame *frame);
ao_poly
ao_lisp_error(int error, char *format, ...);
#define DBG_CONS(a) ao_lisp_cons_print(ao_lisp_cons_poly(a))
#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()
+#define DBG_STACK() ao_lisp_stack_print(ao_lisp_stack_poly(ao_lisp_stack))
static inline void
ao_lisp_frames_dump(void)
{
#define DBG_FRAMES()
#endif
-#define DBG_MEM 0
#define DBG_MEM_START 1
#if DBG_MEM
projects / fw / altos / blobdiff