X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp.h;h=d41086621b24092ae562c8b861a7241cfe12e366;hb=9e1a787f8828fb7b750ad3310c89a89536ea5286;hp=6667dcc2c05f913da4e8ec14e47f0232d86e30fd;hpb=e2f4d25cd6f6f3787d4ee99264732d5b2ce23d4c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp.h b/src/lisp/ao_lisp.h
index 6667dcc2..d4108662 100644
--- a/src/lisp/ao_lisp.h
+++ b/src/lisp/ao_lisp.h
@@ -15,78 +15,166 @@
 #ifndef _AO_LISP_H_
 #define _AO_LISP_H_
 
+#if !defined(AO_LISP_TEST) && !defined(AO_LISP_MAKE_CONST)
+#include <ao.h>
+#define AO_LISP_ALTOS	1
+#endif
+
 #include <stdint.h>
 #include <string.h>
 #include <stdio.h>
 
+#ifdef AO_LISP_MAKE_CONST
+#define AO_LISP_POOL_CONST	16384
+extern uint8_t ao_lisp_const[AO_LISP_POOL_CONST];
+#define _ao_lisp_atom_quote ao_lisp_atom_poly(ao_lisp_atom_intern("quote"))
+#else
+#include "ao_lisp_const.h"
+#endif
+
+/* Primitive types */
+#define AO_LISP_CONS		0
+#define AO_LISP_INT		1
+#define AO_LISP_STRING		2
+#define AO_LISP_OTHER		3
 
-# define AO_LISP_CONS	0
-# define AO_LISP_INT	1
-# define AO_LISP_STRING	2
-# define AO_LISP_OTHER	3
+#define AO_LISP_TYPE_MASK	0x0003
+#define AO_LISP_TYPE_SHIFT	2
+#define AO_LISP_REF_MASK	0x7ffc
+#define AO_LISP_CONST		0x8000
 
-# define AO_LISP_ATOM		4
-# define AO_LISP_BUILTIN	5
+/* These have a type value at the start of the struct */
+#define AO_LISP_ATOM		4
+#define AO_LISP_BUILTIN		5
+#define AO_LISP_NUM_TYPE	6
 
-# define AO_LISP_NIL	0
+#define AO_LISP_NIL	0
 
 #define AO_LISP_POOL	1024
-#define AO_LISP_ROOT	16
 
-static inline void *ao_lisp_set_ref(void *addr) {
-	return (void *) ((intptr_t)addr | 1);
+extern uint8_t		ao_lisp_pool[AO_LISP_POOL];
+extern uint16_t		ao_lisp_top;
+
+#define AO_LISP_OOM		0x01
+#define AO_LISP_DIVIDE_BY_ZERO	0x02
+#define AO_LISP_INVALID		0x04
+
+extern uint8_t		ao_lisp_exception;
+
+typedef uint16_t	ao_poly;
+
+static inline int
+ao_lisp_is_const(ao_poly poly) {
+	return poly & AO_LISP_CONST;
+}
+
+static inline void *
+ao_lisp_ref(ao_poly poly) {
+	if (poly == AO_LISP_NIL)
+		return NULL;
+	if (poly & AO_LISP_CONST)
+		return (void *) ((ao_lisp_const - 4) + (poly & AO_LISP_REF_MASK));
+	else
+		return (void *) ((ao_lisp_pool - 4) + (poly & AO_LISP_REF_MASK));
 }
 
-static inline void *ao_lisp_clear_ref(void *addr) {
-	return (void *) ((intptr_t)addr & ~1);
+static inline ao_poly
+ao_lisp_poly(const void *addr, ao_poly type) {
+	const uint8_t	*a = addr;
+	if (addr == NULL)
+		return AO_LISP_NIL;
+	if (ao_lisp_pool <= a && a < ao_lisp_pool + AO_LISP_POOL)
+		return (a - (ao_lisp_pool - 4)) | type;
+	else if (ao_lisp_const <= a && a <= ao_lisp_const + AO_LISP_POOL_CONST)
+		return AO_LISP_CONST | (a - (ao_lisp_const - 4)) | type;
+	else {
+		ao_lisp_exception |= AO_LISP_INVALID;
+		return AO_LISP_NIL;
+	}
 }
 
-extern uint8_t	ao_lisp_pool[AO_LISP_POOL];
+#define AO_LISP_POLY(addr, type) (((ao_lisp_pool <= ((uint8_t *) (a)) && \
+				    ((uint8_t *) (a)) < ao_lisp_pool + AO_LISP_POOL) ? \
+				   ((uint8_t *) (a) - (ao_lisp_pool - 4)) : \
+				   (((uint8_t *) (a) - (ao_lisp_const - 4)) | AO_LISP_POOL_CONST)) | \
+				  (type))
 
-struct ao_lisp_mem_type {
+struct ao_lisp_type {
 	void	(*mark)(void *addr);
 	int	(*size)(void *addr);
 	void	(*move)(void *addr);
 };
 
-typedef intptr_t	ao_lisp_poly;
-
 struct ao_lisp_cons {
-	ao_lisp_poly		car;
-	struct ao_lisp_cons	*cdr;
+	ao_poly		car;
+	ao_poly		cdr;
 };
 
 struct ao_lisp_atom {
-	uint8_t			type;
-	ao_lisp_poly		val;
-	struct ao_lisp_atom	*next;
-	char			name[];
+	uint8_t		type;
+	uint8_t		pad[1];
+	ao_poly		val;
+	ao_poly		next;
+	char		name[];
 };
 
-#define AO_LISP_ATOM_CONST	((struct ao_lisp_atom *) (intptr_t) 1)
-
-extern const struct ao_lisp_atom *ao_lisp_builtins[];
+#define AO_LISP_LAMBDA	0
+#define AO_LISP_NLAMBDA	1
+#define AO_LISP_MACRO	2
+#define AO_LISP_LEXPR	3
 
 struct ao_lisp_builtin {
-	uint8_t			type;
-	ao_lisp_poly		(*func)(struct ao_lisp_cons *cons);
-	char			name[];
+	uint8_t		type;
+	uint8_t		args;
+	uint16_t	func;
+};
+
+enum ao_lisp_builtin_id {
+	builtin_car,
+	builtin_cdr,
+	builtin_cons,
+	builtin_quote,
+	builtin_set,
+	builtin_setq,
+	builtin_print,
+	builtin_plus,
+	builtin_minus,
+	builtin_times,
+	builtin_divide,
+	builtin_mod,
+	builtin_last
 };
 
+typedef ao_poly (*ao_lisp_func_t)(struct ao_lisp_cons *cons);
+
+extern ao_lisp_func_t	ao_lisp_builtins[];
+
+static inline ao_lisp_func_t
+ao_lisp_func(struct ao_lisp_builtin *b)
+{
+	return ao_lisp_builtins[b->func];
+}
+
 static inline void *
-ao_lisp_poly_other(ao_lisp_poly poly) {
-	return (void *) (poly - AO_LISP_OTHER);
+ao_lisp_poly_other(ao_poly poly) {
+	return ao_lisp_ref(poly);
 }
 
-static const inline ao_lisp_poly
+static inline ao_poly
 ao_lisp_other_poly(const void *other)
 {
-	return (ao_lisp_poly) other + AO_LISP_OTHER;
+	return ao_lisp_poly(other, AO_LISP_OTHER);
 }
 
-#define AO_LISP_OTHER_POLY(other) ((ao_lisp_poly)(other) + AO_LISP_OTHER)
+static inline int
+ao_lisp_mem_round(int size)
+{
+	return (size + 3) & ~3;
+}
+
+#define AO_LISP_OTHER_POLY(other) ((ao_poly)(other) + AO_LISP_OTHER)
 
-static inline int ao_lisp_poly_type(ao_lisp_poly poly) {
+static inline int ao_lisp_poly_type(ao_poly poly) {
 	int	type = poly & 3;
 	if (type == AO_LISP_OTHER)
 		return *((uint8_t *) ao_lisp_poly_other(poly));
@@ -94,75 +182,75 @@ static inline int ao_lisp_poly_type(ao_lisp_poly poly) {
 }
 
 static inline struct ao_lisp_cons *
-ao_lisp_poly_cons(ao_lisp_poly poly)
+ao_lisp_poly_cons(ao_poly poly)
 {
-	return (struct ao_lisp_cons *) (poly - AO_LISP_CONS);
+	return ao_lisp_ref(poly);
 }
 
-static inline ao_lisp_poly
+static inline ao_poly
 ao_lisp_cons_poly(struct ao_lisp_cons *cons)
 {
-	return (ao_lisp_poly) cons + AO_LISP_CONS;
+	return ao_lisp_poly(cons, AO_LISP_CONS);
 }
 
 static inline int
-ao_lisp_poly_int(ao_lisp_poly poly)
+ao_lisp_poly_int(ao_poly poly)
 {
-	return (int) (poly >> 2);
+	return (int) poly >> AO_LISP_TYPE_SHIFT;
 }
 
-static inline ao_lisp_poly
+static inline ao_poly
 ao_lisp_int_poly(int i)
 {
-	return ((ao_lisp_poly) i << 2) + AO_LISP_INT;
+	return ((ao_poly) i << 2) + AO_LISP_INT;
 }
 
 static inline char *
-ao_lisp_poly_string(ao_lisp_poly poly)
+ao_lisp_poly_string(ao_poly poly)
 {
-	return (char *) (poly - AO_LISP_STRING);
+	return ao_lisp_ref(poly);
 }
 
-static inline ao_lisp_poly
-ao_lisp_string_poly(char *s) {
-	return (ao_lisp_poly) s + AO_LISP_STRING;
+static inline ao_poly
+ao_lisp_string_poly(char *s)
+{
+	return ao_lisp_poly(s, AO_LISP_STRING);
 }
 
 static inline struct ao_lisp_atom *
-ao_lisp_poly_atom(ao_lisp_poly poly)
+ao_lisp_poly_atom(ao_poly poly)
 {
-	return (struct ao_lisp_atom *) (poly - AO_LISP_OTHER);
+	return ao_lisp_ref(poly);
 }
 
-static inline ao_lisp_poly
+static inline ao_poly
 ao_lisp_atom_poly(struct ao_lisp_atom *a)
 {
-	return (ao_lisp_poly) a + AO_LISP_OTHER;
+	return ao_lisp_poly(a, AO_LISP_OTHER);
 }
 
 static inline struct ao_lisp_builtin *
-ao_lisp_poly_builtin(ao_lisp_poly poly)
+ao_lisp_poly_builtin(ao_poly poly)
 {
-	return (struct ao_lisp_builtin *) (poly - AO_LISP_OTHER);
+	return ao_lisp_ref(poly);
 }
 
-static inline ao_lisp_poly
+static inline ao_poly
 ao_lisp_builtin_poly(struct ao_lisp_builtin *b)
 {
-	return (ao_lisp_poly) b + AO_LISP_OTHER;
+	return ao_lisp_poly(b, AO_LISP_OTHER);
 }
 
 /* memory functions */
-
 void
-ao_lisp_mark(const struct ao_lisp_mem_type *type, void *addr);
+ao_lisp_mark(const struct ao_lisp_type *type, void *addr);
 
 /* returns 1 if the object was already marked */
 int
 ao_lisp_mark_memory(void *addr, int size);
 
 void *
-ao_lisp_move(const struct ao_lisp_mem_type *type, void *addr);
+ao_lisp_move(const struct ao_lisp_type *type, void *addr);
 
 /* returns NULL if the object was already moved */
 void *
@@ -172,22 +260,22 @@ void *
 ao_lisp_alloc(int size);
 
 int
-ao_lisp_root_add(const struct ao_lisp_mem_type *type, void *addr);
+ao_lisp_root_add(const struct ao_lisp_type *type, void *addr);
 
 void
 ao_lisp_root_clear(void *addr);
 
 /* cons */
-extern const struct ao_lisp_mem_type ao_lisp_cons_type;
+extern const struct ao_lisp_type ao_lisp_cons_type;
 
 struct ao_lisp_cons *
-ao_lisp_cons(ao_lisp_poly car, struct ao_lisp_cons *cdr);
+ao_lisp_cons_cons(ao_poly car, struct ao_lisp_cons *cdr);
 
 void
-ao_lisp_cons_print(struct ao_lisp_cons *cons);
+ao_lisp_cons_print(ao_poly);
 
 /* string */
-extern const struct ao_lisp_mem_type ao_lisp_string_type;
+extern const struct ao_lisp_type ao_lisp_string_type;
 
 char *
 ao_lisp_string_new(int len);
@@ -199,44 +287,50 @@ char *
 ao_lisp_string_cat(char *a, char *b);
 
 void
-ao_lisp_string_print(char *s);
+ao_lisp_string_print(ao_poly s);
 
 /* atom */
-extern const struct ao_lisp_mem_type ao_lisp_atom_type;
+extern const struct ao_lisp_type ao_lisp_atom_type;
+
+extern struct ao_lisp_atom *ao_lisp_atoms;
 
 void
 ao_lisp_atom_init(void);
 
 void
-ao_lisp_atom_print(struct ao_lisp_atom *atom);
+ao_lisp_atom_print(ao_poly a);
 
 struct ao_lisp_atom *
 ao_lisp_atom_intern(char *name);
 
 /* int */
 void
-ao_lisp_int_print(int i);
+ao_lisp_int_print(ao_poly i);
 
 /* prim */
-ao_lisp_poly
-ao_lisp_poly_print(ao_lisp_poly p);
+ao_poly
+ao_lisp_poly_print(ao_poly p);
 
 void
-ao_lisp_poly_mark(ao_lisp_poly p);
+ao_lisp_poly_mark(ao_poly p);
 
-ao_lisp_poly
-ao_lisp_poly_move(ao_lisp_poly p);
+ao_poly
+ao_lisp_poly_move(ao_poly p);
 
 /* eval */
-ao_lisp_poly
-ao_lisp_eval(ao_lisp_poly p);
+ao_poly
+ao_lisp_eval(ao_poly p);
 
 /* builtin */
 void
-ao_lisp_builtin_print(struct ao_lisp_builtin *b);
+ao_lisp_builtin_print(ao_poly b);
 
 /* read */
-ao_lisp_poly
+ao_poly
 ao_lisp_read(void);
 
+/* rep */
+ao_poly
+ao_lisp_read_eval_print(void);
+
 #endif /* _AO_LISP_H_ */