X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flisp%2Fao_lisp_make_const.c;h=178b041efbc5773d3457f81724ac842ba55b7966;hb=5557f6b87a9b8bc9716de8191f2062a772a6ae6c;hp=6f852f9d9a1f15d6c1f148f53c10334c189595de;hpb=417161dbb36323b5a6572859dedad02ca92fc65c;p=fw%2Faltos

diff --git a/src/lisp/ao_lisp_make_const.c b/src/lisp/ao_lisp_make_const.c
index 6f852f9d..178b041e 100644
--- a/src/lisp/ao_lisp_make_const.c
+++ b/src/lisp/ao_lisp_make_const.c
@@ -33,32 +33,42 @@ struct builtin_func {
 };
 
 struct builtin_func funcs[] = {
+	"eval",		AO_LISP_FUNC_F_LAMBDA,	builtin_eval,
+	"read",		AO_LISP_FUNC_F_LAMBDA,	builtin_read,
 	"lambda",	AO_LISP_FUNC_NLAMBDA,	builtin_lambda,
 	"lexpr",	AO_LISP_FUNC_NLAMBDA,	builtin_lexpr,
 	"nlambda",	AO_LISP_FUNC_NLAMBDA,	builtin_nlambda,
 	"macro",	AO_LISP_FUNC_NLAMBDA,	builtin_macro,
-	"car",		AO_LISP_FUNC_LAMBDA,	builtin_car,
-	"cdr",		AO_LISP_FUNC_LAMBDA,	builtin_cdr,
-	"cons",		AO_LISP_FUNC_LAMBDA,	builtin_cons,
-	"last",		AO_LISP_FUNC_LAMBDA,	builtin_last,
+	"car",		AO_LISP_FUNC_F_LAMBDA,	builtin_car,
+	"cdr",		AO_LISP_FUNC_F_LAMBDA,	builtin_cdr,
+	"cons",		AO_LISP_FUNC_F_LAMBDA,	builtin_cons,
+	"last",		AO_LISP_FUNC_F_LAMBDA,	builtin_last,
+	"length",	AO_LISP_FUNC_F_LAMBDA,	builtin_length,
 	"quote",	AO_LISP_FUNC_NLAMBDA,	builtin_quote,
-	"set",		AO_LISP_FUNC_LAMBDA,	builtin_set,
+	"set",		AO_LISP_FUNC_F_LAMBDA,	builtin_set,
 	"setq",		AO_LISP_FUNC_MACRO,	builtin_setq,
 	"cond",		AO_LISP_FUNC_NLAMBDA,	builtin_cond,
-	"print",	AO_LISP_FUNC_LEXPR,	builtin_print,
-	"patom",	AO_LISP_FUNC_LEXPR,	builtin_patom,
-	"+",		AO_LISP_FUNC_LEXPR,	builtin_plus,
-	"-",		AO_LISP_FUNC_LEXPR,	builtin_minus,
-	"*",		AO_LISP_FUNC_LEXPR,	builtin_times,
-	"/",		AO_LISP_FUNC_LEXPR,	builtin_divide,
-	"%",		AO_LISP_FUNC_LEXPR,	builtin_mod,
-	"=",		AO_LISP_FUNC_LEXPR,	builtin_equal,
-	"<",		AO_LISP_FUNC_LEXPR,	builtin_less,
-	">",		AO_LISP_FUNC_LEXPR,	builtin_greater,
-	"<=",		AO_LISP_FUNC_LEXPR,	builtin_less_equal,
-	">=",		AO_LISP_FUNC_LEXPR,	builtin_greater_equal,
-	"delay",	AO_LISP_FUNC_LAMBDA,	builtin_delay,
-	"led",		AO_LISP_FUNC_LEXPR,	builtin_led,
+	"progn",	AO_LISP_FUNC_NLAMBDA,	builtin_progn,
+	"while",	AO_LISP_FUNC_NLAMBDA,	builtin_while,
+	"print",	AO_LISP_FUNC_F_LEXPR,	builtin_print,
+	"patom",	AO_LISP_FUNC_F_LEXPR,	builtin_patom,
+	"+",		AO_LISP_FUNC_F_LEXPR,	builtin_plus,
+	"-",		AO_LISP_FUNC_F_LEXPR,	builtin_minus,
+	"*",		AO_LISP_FUNC_F_LEXPR,	builtin_times,
+	"/",		AO_LISP_FUNC_F_LEXPR,	builtin_divide,
+	"%",		AO_LISP_FUNC_F_LEXPR,	builtin_mod,
+	"=",		AO_LISP_FUNC_F_LEXPR,	builtin_equal,
+	"<",		AO_LISP_FUNC_F_LEXPR,	builtin_less,
+	">",		AO_LISP_FUNC_F_LEXPR,	builtin_greater,
+	"<=",		AO_LISP_FUNC_F_LEXPR,	builtin_less_equal,
+	">=",		AO_LISP_FUNC_F_LEXPR,	builtin_greater_equal,
+	"pack",		AO_LISP_FUNC_F_LAMBDA,	builtin_pack,
+	"unpack",	AO_LISP_FUNC_F_LAMBDA,	builtin_unpack,
+	"flush",	AO_LISP_FUNC_F_LAMBDA,	builtin_flush,
+	"delay",	AO_LISP_FUNC_F_LAMBDA,	builtin_delay,
+	"led",		AO_LISP_FUNC_F_LEXPR,	builtin_led,
+	"save",		AO_LISP_FUNC_F_LAMBDA,	builtin_save,
+	"restore",	AO_LISP_FUNC_F_LAMBDA,	builtin_restore,
 };
 
 #define N_FUNC (sizeof funcs / sizeof funcs[0])
@@ -76,6 +86,33 @@ is_atom(int offset)
 	return 0;
 }
 
+#define AO_FEC_CRC_INIT	0xffff
+
+static inline uint16_t
+ao_fec_crc_byte(uint8_t byte, uint16_t crc)
+{
+	uint8_t	bit;
+
+	for (bit = 0; bit < 8; bit++) {
+		if (((crc & 0x8000) >> 8) ^ (byte & 0x80))
+			crc = (crc << 1) ^ 0x8005;
+		else
+			crc = (crc << 1);
+		byte <<= 1;
+	}
+	return crc;
+}
+
+uint16_t
+ao_fec_crc(const uint8_t *bytes, uint8_t len)
+{
+	uint16_t	crc = AO_FEC_CRC_INIT;
+
+	while (len--)
+		crc = ao_fec_crc_byte(*bytes++, crc);
+	return crc;
+}
+
 int
 main(int argc, char **argv)
 {
@@ -101,20 +138,12 @@ main(int argc, char **argv)
 	ao_lisp_atom_set(ao_lisp_atom_poly(a),
 			 ao_lisp_atom_poly(a));
 
-	for (;;) {
-		sexpr = ao_lisp_read();
-		if (!sexpr)
-			break;
-		printf ("sexpr: ");
-		ao_lisp_poly_print(sexpr);
-		printf("\n");
-		val = ao_lisp_eval(sexpr);
-		if (ao_lisp_exception)
-			exit(1);
-		printf("\t");
-		ao_lisp_poly_print(val);
-		printf("\n");
-	}
+	/* end of file value */
+	a = ao_lisp_atom_intern("eof");
+	ao_lisp_atom_set(ao_lisp_atom_poly(a),
+			 ao_lisp_atom_poly(a));
+
+	ao_lisp_read_eval_print();
 
 	/* Reduce to referenced values */
 	ao_lisp_collect();
@@ -124,6 +153,7 @@ main(int argc, char **argv)
 	printf("extern const uint8_t ao_lisp_const[AO_LISP_POOL_CONST] __attribute__((aligned(4)));\n");
 	printf("#define ao_builtin_atoms 0x%04x\n", ao_lisp_atom_poly(ao_lisp_atoms));
 	printf("#define ao_builtin_frame 0x%04x\n", ao_lisp_frame_poly(ao_lisp_frame_global));
+	printf("#define ao_lisp_const_checksum ((uint16_t) 0x%04x)\n", ao_fec_crc(ao_lisp_const, ao_lisp_top));
 
 	for (a = ao_lisp_atoms; a; a = ao_lisp_poly_atom(a->next)) {
 		char	*n = a->name, c;