X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fscheme%2Fao_scheme.h;h=ad80db2f03cb433835d2e84c8da43b024ec7c8c5;hb=ca27d467198c556be483961a6ca3b8f97bbe96a6;hp=896166174e691036d9b1b7c07ebb4c769ee68fd4;hpb=d1d98e408311c5ba18138a18f4c88448e4254626;p=fw%2Faltos diff --git a/src/scheme/ao_scheme.h b/src/scheme/ao_scheme.h index 89616617..ad80db2f 100644 --- a/src/scheme/ao_scheme.h +++ b/src/scheme/ao_scheme.h @@ -23,6 +23,9 @@ #include #include +#define AO_SCHEME_BUILTIN_FEATURES +#include "ao_scheme_builtin.h" +#undef AO_SCHEME_BUILTIN_FEATURES #include #ifndef __BYTE_ORDER #include @@ -40,6 +43,10 @@ struct ao_scheme_os_save { uint16_t const_checksum_inv; }; +#ifndef AO_SCHEME_POOL_TOTAL +#error Must define AO_SCHEME_POOL_TOTAL for AO_SCHEME_SAVE +#endif + #define AO_SCHEME_POOL_EXTRA (sizeof(struct ao_scheme_os_save)) #define AO_SCHEME_POOL ((int) (AO_SCHEME_POOL_TOTAL - AO_SCHEME_POOL_EXTRA)) @@ -60,7 +67,7 @@ extern uint8_t ao_scheme_const[AO_SCHEME_POOL_CONST] __attribute__((aligned(4))) #define ao_scheme_pool ao_scheme_const #define AO_SCHEME_POOL AO_SCHEME_POOL_CONST -#define _atom(n) ao_scheme_atom_poly(ao_scheme_atom_intern(n)) +#define _atom(n) ao_scheme_atom_poly(ao_scheme_atom_intern((char *) n)) #define _bool(v) ao_scheme_bool_poly(ao_scheme_bool_get(v)) #define _ao_scheme_bool_true _bool(1) @@ -75,7 +82,7 @@ extern uint8_t ao_scheme_const[AO_SCHEME_POOL_CONST] __attribute__((aligned(4))) #else #include "ao_scheme_const.h" #ifndef AO_SCHEME_POOL -#define AO_SCHEME_POOL 3072 +#error Must define AO_SCHEME_POOL #endif #ifndef AO_SCHEME_POOL_EXTRA #define AO_SCHEME_POOL_EXTRA 0 @@ -102,10 +109,25 @@ extern uint8_t ao_scheme_pool[AO_SCHEME_POOL + AO_SCHEME_POOL_EXTRA] __attribut #define AO_SCHEME_LAMBDA 8 #define AO_SCHEME_STACK 9 #define AO_SCHEME_BOOL 10 +#ifdef AO_SCHEME_FEATURE_BIGINT #define AO_SCHEME_BIGINT 11 -#define AO_SCHEME_FLOAT 12 +#define _AO_SCHEME_BIGINT AO_SCHEME_BIGINT +#else +#define _AO_SCHEME_BIGINT AO_SCHEME_BOOL +#endif +#ifdef AO_SCHEME_FEATURE_FLOAT +#define AO_SCHEME_FLOAT (_AO_SCHEME_BIGINT + 1) +#define _AO_SCHEME_FLOAT AO_SCHEME_FLOAT +#else +#define _AO_SCHEME_FLOAT _AO_SCHEME_BIGINT +#endif +#ifdef AO_SCHEME_FEATURE_VECTOR #define AO_SCHEME_VECTOR 13 -#define AO_SCHEME_NUM_TYPE 14 +#define _AO_SCHEME_VECTOR AO_SCHEME_VECTOR +#else +#define _AO_SCHEME_VECTOR _AO_SCHEME_FLOAT +#endif +#define AO_SCHEME_NUM_TYPE (_AO_SCHEME_VECTOR+1) /* Leave two bits for types to use as they please */ #define AO_SCHEME_OTHER_TYPE_MASK 0x3f @@ -182,25 +204,38 @@ struct ao_scheme_bool { uint16_t pad; }; -struct ao_scheme_bigint { - uint32_t value; -}; +#ifdef AO_SCHEME_FEATURE_FLOAT struct ao_scheme_float { uint8_t type; uint8_t pad1; uint16_t pad2; float value; }; +#endif +#ifdef AO_SCHEME_FEATURE_VECTOR struct ao_scheme_vector { uint8_t type; uint8_t pad1; uint16_t length; ao_poly vals[]; }; +#endif + +#define AO_SCHEME_MIN_INT (-(1 << (15 - AO_SCHEME_TYPE_SHIFT))) +#define AO_SCHEME_MAX_INT ((1 << (15 - AO_SCHEME_TYPE_SHIFT)) - 1) + +#ifdef AO_SCHEME_FEATURE_BIGINT +struct ao_scheme_bigint { + uint32_t value; +}; + +#define AO_SCHEME_MIN_BIGINT (-(1 << 24)) +#define AO_SCHEME_MAX_BIGINT ((1 << 24) - 1) #if __BYTE_ORDER == __LITTLE_ENDIAN + static inline uint32_t ao_scheme_int_bigint(int32_t i) { return AO_SCHEME_BIGINT | (i << 8); @@ -218,12 +253,9 @@ static inlint int32_t ao_scheme_bigint_int(uint32_t bi) { return (int32_t) (bi << 8) >> 8; } -#endif -#define AO_SCHEME_MIN_INT (-(1 << (15 - AO_SCHEME_TYPE_SHIFT))) -#define AO_SCHEME_MAX_INT ((1 << (15 - AO_SCHEME_TYPE_SHIFT)) - 1) -#define AO_SCHEME_MIN_BIGINT (-(1 << 24)) -#define AO_SCHEME_MAX_BIGINT ((1 << 24) - 1) +#endif /* __BYTE_ORDER */ +#endif /* AO_SCHEME_FEATURE_BIGINT */ #define AO_SCHEME_NOT_INTEGER 0x7fffffff @@ -433,6 +465,7 @@ ao_scheme_int_poly(int32_t i) return ((ao_poly) i << 2) | AO_SCHEME_INT; } +#ifdef AO_SCHEME_FEATURE_BIGINT static inline struct ao_scheme_bigint * ao_scheme_poly_bigint(ao_poly poly) { @@ -444,6 +477,7 @@ ao_scheme_bigint_poly(struct ao_scheme_bigint *bi) { return ao_scheme_poly(bi, AO_SCHEME_OTHER); } +#endif /* AO_SCHEME_FEATURE_BIGINT */ static inline char * ao_scheme_poly_string(ao_poly poly) @@ -493,6 +527,7 @@ ao_scheme_poly_bool(ao_poly poly) return ao_scheme_ref(poly); } +#ifdef AO_SCHEME_FEATURE_FLOAT static inline ao_poly ao_scheme_float_poly(struct ao_scheme_float *f) { @@ -507,7 +542,9 @@ ao_scheme_poly_float(ao_poly poly) float ao_scheme_poly_number(ao_poly p); +#endif +#ifdef AO_SCHEME_FEATURE_VECTOR static inline ao_poly ao_scheme_vector_poly(struct ao_scheme_vector *v) { @@ -519,28 +556,18 @@ ao_scheme_poly_vector(ao_poly poly) { return ao_scheme_ref(poly); } +#endif /* memory functions */ -extern int ao_scheme_collects[2]; -extern int ao_scheme_freed[2]; -extern int ao_scheme_loops[2]; - -/* returns 1 if the object was already marked */ -int -ao_scheme_mark(const struct ao_scheme_type *type, void *addr); +extern uint64_t ao_scheme_collects[2]; +extern uint64_t ao_scheme_freed[2]; +extern uint64_t ao_scheme_loops[2]; /* returns 1 if the object was already marked */ int ao_scheme_mark_memory(const struct ao_scheme_type *type, void *addr); -void * -ao_scheme_move_map(void *addr); - -/* returns 1 if the object was already moved */ -int -ao_scheme_move(const struct ao_scheme_type *type, void **ref); - /* returns 1 if the object was already moved */ int ao_scheme_move_memory(const struct ao_scheme_type *type, void **ref); @@ -601,7 +628,7 @@ void ao_scheme_bool_write(ao_poly v); #ifdef AO_SCHEME_MAKE_CONST -struct ao_scheme_bool *ao_scheme_true, *ao_scheme_false; +extern struct ao_scheme_bool *ao_scheme_true, *ao_scheme_false; struct ao_scheme_bool * ao_scheme_bool_get(uint8_t value); @@ -634,6 +661,9 @@ ao_scheme_cons_display(ao_poly); int ao_scheme_cons_length(struct ao_scheme_cons *cons); +struct ao_scheme_cons * +ao_scheme_cons_copy(struct ao_scheme_cons *cons); + /* string */ extern const struct ao_scheme_type ao_scheme_string_type; @@ -684,6 +714,7 @@ ao_scheme_atom_def(ao_poly atom, ao_poly val); void ao_scheme_int_write(ao_poly i); +#ifdef AO_SCHEME_FEATURE_BIGINT int32_t ao_scheme_poly_integer(ao_poly p); @@ -701,6 +732,19 @@ ao_scheme_bigint_write(ao_poly i); extern const struct ao_scheme_type ao_scheme_bigint_type; +#else + +#define ao_scheme_poly_integer ao_scheme_poly_int +#define ao_scheme_integer_poly ao_scheme_int_poly + +static inline int +ao_scheme_integer_typep(uint8_t t) +{ + return (t == AO_SCHEME_INT); +} + +#endif /* AO_SCHEME_FEATURE_BIGINT */ + /* vector */ void @@ -727,11 +771,14 @@ ao_scheme_vector_to_list(struct ao_scheme_vector *vector); extern const struct ao_scheme_type ao_scheme_vector_type; /* prim */ -void -ao_scheme_poly_write(ao_poly p); +void (*ao_scheme_poly_write_func(ao_poly p))(ao_poly p); +void (*ao_scheme_poly_display_func(ao_poly p))(ao_poly p); -void -ao_scheme_poly_display(ao_poly p); +static inline void +ao_scheme_poly_write(ao_poly p) { (*ao_scheme_poly_write_func(p))(p); } + +static inline void +ao_scheme_poly_display(ao_poly p) { (*ao_scheme_poly_display_func(p))(p); } int ao_scheme_poly_mark(ao_poly p, uint8_t note_cons); @@ -755,6 +802,7 @@ ao_poly ao_scheme_set_cond(struct ao_scheme_cons *cons); /* float */ +#ifdef AO_SCHEME_FEATURE_FLOAT extern const struct ao_scheme_type ao_scheme_float_type; void @@ -762,15 +810,17 @@ ao_scheme_float_write(ao_poly p); ao_poly ao_scheme_float_get(float value); +#endif +#ifdef AO_SCHEME_FEATURE_FLOAT static inline uint8_t ao_scheme_number_typep(uint8_t t) { return ao_scheme_integer_typep(t) || (t == AO_SCHEME_FLOAT); } - -float -ao_scheme_poly_number(ao_poly p); +#else +#define ao_scheme_number_typep ao_scheme_integer_typep +#endif /* builtin */ void @@ -879,19 +929,19 @@ ao_scheme_stack_eval(void); /* error */ void -ao_scheme_vprintf(char *format, va_list args); +ao_scheme_vprintf(const char *format, va_list args); void -ao_scheme_printf(char *format, ...); +ao_scheme_printf(const char *format, ...); void -ao_scheme_error_poly(char *name, ao_poly poly, ao_poly last); +ao_scheme_error_poly(const char *name, ao_poly poly, ao_poly last); void -ao_scheme_error_frame(int indent, char *name, struct ao_scheme_frame *frame); +ao_scheme_error_frame(int indent, const char *name, struct ao_scheme_frame *frame); ao_poly -ao_scheme_error(int error, char *format, ...); +ao_scheme_error(int error, const char *format, ...); /* builtins */