X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=gmqcc.h;h=8ebe3afd60e0dae8f3a7e38ad6a07f843ab163fe;hp=fc92d13582b2f0553f6dc05a433d29c2255ec1f0;hb=d05bee94d1c2119fc978be8c752ee50758f54a42;hpb=3e7a8c0e78468a18933bccd3af9c338986556d7a diff --git a/gmqcc.h b/gmqcc.h index fc92d13..8ebe3af 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -52,11 +52,16 @@ # endif /* !true */ # define false (0) # define true (1) -# define bool _Bool -# if __STDC_VERSION__ < 199901L && __GNUC__ < 3 - typedef int _Bool -# endif -# endif /* !__cplusplus */ +# ifdef __STDC_VERSION__ +# if __STDC_VERSION__ < 199901L && __GNUC__ < 3 + typedef int bool; +# else + typedef _Bool bool; +# endif +# else + typedef int bool; +# endif /* !__STDC_VERSION__ */ +#endif /* !__cplusplus */ /* * Of some functions which are generated we want to make sure @@ -72,25 +77,41 @@ * This is a hack to silent clang regarding empty * body if statements. */ -#define GMQCC_SUPRESS_EMPTY_BODY do { } while (0) +#define GMQCC_SUPPRESS_EMPTY_BODY do { } while (0) /* * Inline is not supported in < C90, however some compilers * like gcc and clang might have an inline attribute we can * use if present. */ -#if __STDC_VERSION__ < 199901L -# if defined(__GNUC__) || defined (__CLANG__) -# if __GNUC__ < 2 -# define GMQCC_INLINE +#ifdef __STDC_VERSION__ +# if __STDC_VERSION__ < 199901L +# if defined(__GNUC__) || defined (__CLANG__) +# if __GNUC__ < 2 +# define GMQCC_INLINE +# else +# define GMQCC_INLINE __attribute__ ((always_inline)) +# endif # else -# define GMQCC_INLINE __attribute__ ((always_inline)) +# define GMQCC_INLINE # endif -# else -# define GMQCC_INLINE -# endif +# else +# define GMQCC_INLINE inline +# endif #else -# define GMQCC_INLINE inline +# define GMQCC_INLINE +#endif /* !__STDC_VERSION__ */ + +/* + * noreturn is present in GCC and clang + * it's required for _ast_node_destory otherwise -Wmissing-noreturn + * in clang complains about there being no return since abort() is + * called. + */ +#if (defined(__GNUC__) && __GNUC__ >= 2) || defined(__CLANG__) +# define GMQCC_NORETURN __attribute__ ((noreturn)) +#else +# define GMQCC_NORETURN #endif /* @@ -119,9 +140,25 @@ typedef long int32_t; typedef unsigned long uint32_t; - /* bail on 64 bit type! */ - typedef char int64_t; - typedef char uint64_t; + /* + * It's nearly impossible to figure out a 64bit type at + * this point without making assumptions about the build + * enviroment. So if clang or gcc is detected use some + * compiler builtins to create a 64 signed and unsigned + * type. + */ +# if defined(__GNUC__) || defined (__CLANG__) + typedef int int64_t __attribute__((__mode__(__DI__))); + typedef unsigned int uint64_t __attribute__((__mode__(__DI__))); +# else + /* + * Incoorectly size the types so static assertions below will + * fail. There is no valid way to get a 64bit type at this point + * without making assumptions of too many things. + */ + typedef struct { char _fail : 0; } int64_t; + typedef struct { char _fail : 0; } uint64_t; +# endif #endif #ifdef _LP64 /* long pointer == 64 */ typedef unsigned long uintptr_t; @@ -132,7 +169,7 @@ #endif /* Ensure type sizes are correct: */ typedef char uint8_size_is_correct [sizeof(uint8_t) == 1?1:-1]; -typedef char uint16_size_if_correct [sizeof(uint16_t) == 2?1:-1]; +typedef char uint16_size_is_correct [sizeof(uint16_t) == 2?1:-1]; typedef char uint32_size_is_correct [sizeof(uint32_t) == 4?1:-1]; typedef char uint64_size_is_correct [sizeof(uint64_t) == 8?1:-1]; typedef char int16_size_if_correct [sizeof(int16_t) == 2?1:-1]; @@ -240,6 +277,7 @@ void util_meminfo (); bool util_strupper (const char *); bool util_strdigit (const char *); +bool util_strncmpexact (const char *, const char *, size_t); char *util_strdup (const char *); char *util_strrq (const char *); char *util_strrnl (const char *); @@ -249,6 +287,9 @@ void util_debug (const char *, const char *, ...); int util_getline (char **, size_t *, FILE *); void util_endianswap (void *, int, int); +size_t util_strtocmd (const char *, char *, size_t); +size_t util_strtononcmd (const char *, char *, size_t); + uint32_t util_crc32(const char *, int, register const short); #ifdef NOTRACK @@ -259,6 +300,14 @@ uint32_t util_crc32(const char *, int, register const short); # define mem_d(x) util_memory_d((x), __LINE__, __FILE__) #endif +/* + * TODO: make these safer to use. Currently this only works on + * x86 and x86_64, some systems will likely not like this. Such + * as BE systems. + */ +#define FLT2INT(Y) *((int32_t*)&(Y)) +#define INT2FLT(Y) *((float *)&(Y)) + /* Builds vector type (usefull for inside structures) */ #define VECTOR_SNAP(X,Y) X ## Y #define VECTOR_FILL(X,Y) VECTOR_SNAP(X,Y) @@ -294,7 +343,12 @@ uint32_t util_crc32(const char *, int, register const short); return N##_elements; \ } \ typedef char VECTOR_FILL(extra_semicolon_,__COUNTER__) -/* Builds a full vector inspot */ +#define VECTOR_PROT(T,N) \ + extern T* N##_data ; \ + extern long N##_elements ; \ + extern long N##_allocated; \ + int N##_add(T); \ + int N##_put(T *, size_t) #define VECTOR_MAKE(T,N) \ VECTOR_TYPE(T,N); \ VECTOR_CORE(T,N) @@ -302,6 +356,8 @@ uint32_t util_crc32(const char *, int, register const short); /*===================================================================*/ /*=========================== code.c ================================*/ /*===================================================================*/ + +/* Note: if you change the order, fix type_sizeof in ir.c */ enum { TYPE_VOID , TYPE_STRING , @@ -312,9 +368,39 @@ enum { TYPE_FUNCTION , TYPE_POINTER , /* TYPE_INTEGER , */ - TYPE_VARIANT + TYPE_VARIANT , + + TYPE_COUNT }; +extern size_t type_sizeof[TYPE_COUNT]; +extern uint16_t type_store_instr[TYPE_COUNT]; +/* could use type_store_instr + INSTR_STOREP_F - INSTR_STORE_F + * but this breaks when TYPE_INTEGER is added, since with the enhanced + * instruction set, the old ones are left untouched, thus the _I instructions + * are at a seperate place. + */ +extern uint16_t type_storep_instr[TYPE_COUNT]; + +typedef struct { + uint32_t offset; /* Offset in file of where data begins */ + uint32_t length; /* Length of section (how many of) */ +} prog_section; + +typedef struct { + uint32_t version; /* Program version (6) */ + uint16_t crc16; /* What is this? */ + uint16_t skip; /* see propsal.txt */ + + prog_section statements; /* prog_section_statement */ + prog_section defs; /* prog_section_def */ + prog_section fields; /* prog_section_field */ + prog_section functions; /* prog_section_function */ + prog_section strings; /* What is this? */ + prog_section globals; /* What is this? */ + uint32_t entfield; /* Number of entity fields */ +} prog_header; + /* * Each paramater incerements by 3 since vector types hold * 3 components (x,y,z). @@ -340,13 +426,13 @@ typedef struct { } o1; /* operand 2 */ union { - int16_t s2; /* signed */ - uint16_t u2; /* unsigned */ + int16_t s1; /* signed */ + uint16_t u1; /* unsigned */ } o2; /* operand 3 */ union { - int16_t s3; /* signed */ - uint16_t u3; /* unsigned */ + int16_t s1; /* signed */ + uint16_t u1; /* unsigned */ } o3; /* @@ -463,7 +549,15 @@ enum { INSTR_BITAND, INSTR_BITOR, - /* Virtual instructions used by the IR + /* + * Virtual instructions used by the assembler + * keep at the end but before virtual instructions + * for the IR below. + */ + AINSTR_END, + + /* + * Virtual instructions used by the IR * Keep at the end! */ VINSTR_PHI, @@ -482,31 +576,26 @@ enum { * VECTOR_MAKE(int, code_globals ); * VECTOR_MAKE(char, code_chars ); */ -int code_statements_add(prog_section_statement); -int code_defs_add (prog_section_def); -int code_fields_add (prog_section_field); -int code_functions_add (prog_section_function); -int code_globals_add (int); -int code_chars_add (char); -int code_statements_put(prog_section_statement*, size_t); -int code_defs_put (prog_section_def*, size_t); -int code_fields_put (prog_section_field*, size_t); -int code_functions_put (prog_section_function*, size_t); -int code_globals_put (int*, size_t); -int code_chars_put (char*, size_t); -extern long code_statements_elements; -extern long code_chars_elements; -extern long code_globals_elements; -extern long code_functions_elements; -extern long code_fields_elements; -extern long code_defs_elements; +VECTOR_PROT(prog_section_statement, code_statements); +VECTOR_PROT(prog_section_statement, code_statements); +VECTOR_PROT(prog_section_def, code_defs ); +VECTOR_PROT(prog_section_field, code_fields ); +VECTOR_PROT(prog_section_function, code_functions ); +VECTOR_PROT(int, code_globals ); +VECTOR_PROT(char, code_chars ); + +typedef float qcfloat; +typedef int32_t qcint; /* * code_write -- writes out the compiled file * code_init -- prepares the code file */ -void code_write (); -void code_init (); +bool code_write (const char *filename); +void code_init (); +uint32_t code_genstring (const char *string); +uint32_t code_cachedstring(const char *string); +qcint code_alloc_field (size_t qcsize); /*===================================================================*/ /*========================= assembler.c =============================*/ @@ -530,7 +619,7 @@ static const struct { { "EQ_V" , 0, 4 }, { "EQ_S" , 0, 4 }, { "EQ_E" , 0, 4 }, - { "ES_FNC" , 0, 6 }, + { "EQ_FNC" , 0, 6 }, { "NE_F" , 0, 4 }, { "NE_V" , 0, 4 }, { "NE_S" , 0, 4 }, @@ -567,41 +656,28 @@ static const struct { { "NOT_FNC" , 0, 7 }, { "IF" , 0, 2 }, { "IFNOT" , 0, 5 }, - { "CALL0" , 0, 5 }, - { "CALL1" , 0, 5 }, - { "CALL2" , 0, 5 }, - { "CALL3" , 0, 5 }, - { "CALL4" , 0, 5 }, - { "CALL5" , 0, 5 }, - { "CALL6" , 0, 5 }, - { "CALL7" , 0, 5 }, - { "CALL8" , 0, 5 }, + { "CALL0" , 1, 5 }, + { "CALL1" , 2, 5 }, + { "CALL2" , 3, 5 }, + { "CALL3" , 4, 5 }, + { "CALL4" , 5, 5 }, + { "CALL5" , 6, 5 }, + { "CALL6" , 7, 5 }, + { "CALL7" , 8, 5 }, + { "CALL8" , 9, 5 }, { "STATE" , 0, 5 }, { "GOTO" , 0, 4 }, { "AND" , 0, 3 }, { "OR" , 0, 2 }, { "BITAND" , 0, 6 }, - { "BITOR" , 0, 5 } + { "BITOR" , 0, 5 }, + { "END" , 0, 3 } /* virtual assembler instruction */ }; void asm_init (const char *, FILE **); void asm_close(FILE *); void asm_parse(FILE *); /*===================================================================*/ -/*============================= main.c ==============================*/ -/*===================================================================*/ -enum { - COMPILER_QCC, /* circa QuakeC */ - COMPILER_FTEQCC, /* fteqcc QuakeC */ - COMPILER_QCCX, /* qccx QuakeC */ - COMPILER_GMQCC /* this QuakeC */ -}; -extern bool opts_debug; -extern bool opts_memchk; -extern bool opts_darkplaces_stringtablebug; -extern bool opts_omit_nullcode; -extern int opts_compiler; -/*===================================================================*/ /*============================= ast.c ===============================*/ /*===================================================================*/ #define MEM_VECTOR_PROTO(Towner, Tmem, mem) \ @@ -618,7 +694,7 @@ extern int opts_compiler; size_t name##_count; \ size_t name##_alloc -#define _MEM_VEC_FUN_ADD(Tself, Twhat, mem) \ +#define MEM_VEC_FUN_ADD(Tself, Twhat, mem) \ bool GMQCC_WARN Tself##_##mem##_add(Tself *self, Twhat f) \ { \ Twhat *reall; \ @@ -640,7 +716,7 @@ bool GMQCC_WARN Tself##_##mem##_add(Tself *self, Twhat f) \ return true; \ } -#define _MEM_VEC_FUN_REMOVE(Tself, Twhat, mem) \ +#define MEM_VEC_FUN_REMOVE(Tself, Twhat, mem) \ bool GMQCC_WARN Tself##_##mem##_remove(Tself *self, size_t idx) \ { \ size_t i; \ @@ -665,7 +741,7 @@ bool GMQCC_WARN Tself##_##mem##_remove(Tself *self, size_t idx) \ return true; \ } -#define _MEM_VEC_FUN_FIND(Tself, Twhat, mem) \ +#define MEM_VEC_FUN_FIND(Tself, Twhat, mem) \ bool GMQCC_WARN Tself##_##mem##_find(Tself *self, Twhat obj, size_t *idx) \ { \ size_t i; \ @@ -680,7 +756,57 @@ bool GMQCC_WARN Tself##_##mem##_find(Tself *self, Twhat obj, size_t *idx) \ return false; \ } -#define _MEM_VEC_FUN_CLEAR(Tself, mem) \ +#define MEM_VEC_FUN_APPEND(Tself, Twhat, mem) \ +bool GMQCC_WARN Tself##_##mem##_append(Tself *s, Twhat *p, size_t c) \ +{ \ + Twhat *reall; \ + if (s->mem##_count+c >= s->mem##_alloc) { \ + if (!s->mem##_alloc) { \ + s->mem##_alloc = c < 16 ? 16 : c; \ + } else { \ + s->mem##_alloc *= 2; \ + if (s->mem##_count+c >= s->mem##_alloc) { \ + s->mem##_alloc = s->mem##_count+c; \ + } \ + } \ + reall = (Twhat*)mem_a(sizeof(Twhat) * s->mem##_alloc); \ + if (!reall) { \ + return false; \ + } \ + memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count); \ + mem_d(s->mem); \ + s->mem = reall; \ + } \ + memcpy(&s->mem[s->mem##_count], p, c*sizeof(*p)); \ + s->mem##_count += c; \ + return true; \ +} + +#define MEM_VEC_FUN_RESIZE(Tself, Twhat, mem) \ +bool GMQCC_WARN Tself##_##mem##_resize(Tself *s, size_t c) \ +{ \ + Twhat *reall; \ + if (c > s->mem##_alloc) { \ + reall = (Twhat*)mem_a(sizeof(Twhat) * c); \ + if (!reall) { return false; } \ + memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count); \ + s->mem##_alloc = c; \ + mem_d(s->mem); \ + s->mem = reall; \ + return true; \ + } \ + s->mem##_count = c; \ + if (c < (s->mem##_alloc / 2)) { \ + reall = (Twhat*)mem_a(sizeof(Twhat) * c); \ + if (!reall) { return false; } \ + memcpy(reall, s->mem, sizeof(Twhat) * c); \ + mem_d(s->mem); \ + s->mem = reall; \ + } \ + return true; \ +} + +#define MEM_VEC_FUN_CLEAR(Tself, mem) \ void Tself##_##mem##_clear(Tself *self) \ { \ if (!self->mem) \ @@ -706,18 +832,20 @@ void Tself##_##mem##_clear(Tself *self) \ } #define MEM_VEC_FUNCTIONS(Tself, Twhat, mem) \ -_MEM_VEC_FUN_REMOVE(Tself, Twhat, mem) \ -_MEM_VEC_FUN_ADD(Tself, Twhat, mem) +MEM_VEC_FUN_REMOVE(Tself, Twhat, mem) \ +MEM_VEC_FUN_ADD(Tself, Twhat, mem) #define MEM_VEC_FUNCTIONS_ALL(Tself, Twhat, mem) \ MEM_VEC_FUNCTIONS(Tself, Twhat, mem) \ -_MEM_VEC_FUN_CLEAR(Tself, mem) \ -_MEM_VEC_FUN_FIND(Tself, Twhat, mem) +MEM_VEC_FUN_CLEAR(Tself, mem) \ +MEM_VEC_FUN_FIND(Tself, Twhat, mem) enum store_types { store_global, store_local, /* local, assignable for now, should get promoted later */ - store_value /* unassignable */ + store_param, /* parameters, they are locals with a fixed position */ + store_value, /* unassignable */ + store_return /* unassignable, at OFS_RETURN */ }; typedef struct { @@ -732,4 +860,165 @@ typedef struct { const char *file; size_t line; } lex_ctx; + +/*===================================================================*/ +/*============================= exec.c ==============================*/ +/*===================================================================*/ + +/* darkplaces has (or will have) a 64 bit prog loader + * where the 32 bit qc program is autoconverted on load. + * Since we may want to support that as well, let's redefine + * float and int here. + */ +typedef union { + qcint _int; + qcint string; + qcint function; + qcint edict; + qcfloat _float; + qcfloat vector[3]; + qcint ivector[3]; +} qcany; + +typedef char qcfloat_size_is_correct [sizeof(qcfloat) == 4 ?1:-1]; +typedef char qcint_size_is_correct [sizeof(qcint) == 4 ?1:-1]; + +enum { + VMERR_OK, + VMERR_TEMPSTRING_ALLOC, + + VMERR_END +}; + +#define VM_JUMPS_DEFAULT 1000000 + +/* execute-flags */ +#define VMXF_DEFAULT 0x0000 /* default flags - nothing */ +#define VMXF_TRACE 0x0001 /* trace: print statements before executing */ +#define VMXF_PROFILE 0x0002 /* profile: increment the profile counters */ + +struct qc_program_s; + +typedef int (*prog_builtin)(struct qc_program_s *prog); + +typedef struct { + qcint stmt; + size_t localsp; + prog_section_function *function; +} qc_exec_stack; + +typedef struct qc_program_s { + char *filename; + + MEM_VECTOR_MAKE(prog_section_statement, code); + MEM_VECTOR_MAKE(prog_section_def, defs); + MEM_VECTOR_MAKE(prog_section_def, fields); + MEM_VECTOR_MAKE(prog_section_function, functions); + MEM_VECTOR_MAKE(char, strings); + MEM_VECTOR_MAKE(qcint, globals); + MEM_VECTOR_MAKE(qcint, entitydata); + + size_t tempstring_start; + size_t tempstring_at; + + qcint vmerror; + + MEM_VECTOR_MAKE(size_t, profile); + + MEM_VECTOR_MAKE(prog_builtin, builtins); + + /* size_t ip; */ + qcint entities; + size_t entityfields; + bool allowworldwrites; + + MEM_VECTOR_MAKE(qcint, localstack); + MEM_VECTOR_MAKE(qc_exec_stack, stack); + size_t statement; + + int argc; /* current arg count for debugging */ +} qc_program; + +qc_program* prog_load(const char *filename); +void prog_delete(qc_program *prog); + +bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps); + +char* prog_getstring (qc_program *prog, qcint str); +prog_section_def* prog_entfield (qc_program *prog, qcint off); +prog_section_def* prog_getdef (qc_program *prog, qcint off); +qcany* prog_getedict (qc_program *prog, qcint e); +qcint prog_tempstring(qc_program *prog, const char *_str); + +/*===================================================================*/ +/*======================= main.c commandline ========================*/ +/*===================================================================*/ + +#if 0 +/* Helpers to allow for a whole lot of flags. Otherwise we'd limit + * to 32 or 64 -f options... + */ +typedef struct { + size_t idx; /* index into an array of 32 bit words */ + uint8_t bit; /* index _into_ the 32 bit word, thus just uint8 */ +} longbit; +#define LONGBIT(bit) { ((bit)/32), ((bit)%32) } +#else +typedef uint32_t longbit; +#define LONGBIT(bit) (bit) +#endif + +/* Used to store the list of flags with names */ +typedef struct { + const char *name; + longbit bit; +} opts_flag_def; + +/*===================================================================*/ +/* list of -f flags, like -fdarkplaces-string-table-bug */ +enum { +# define GMQCC_DEFINE_FLAG(X) X, +# include "flags.def" +# undef GMQCC_DEFINE_FLAG + COUNT_FLAGS +}; +static const opts_flag_def opts_flag_list[] = { +# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) }, +# include "flags.def" +# undef GMQCC_DEFINE_FLAG + { NULL, LONGBIT(0) } +}; + +enum { +# define GMQCC_DEFINE_FLAG(X) X, +# include "warns.def" +# undef GMQCC_DEFINE_FLAG + COUNT_WARNINGS +}; +static const opts_flag_def opts_warn_list[] = { +# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) }, +# include "warns.def" +# undef GMQCC_DEFINE_FLAG + { NULL, LONGBIT(0) } +}; + +/* other options: */ +enum { + COMPILER_QCC, /* circa QuakeC */ + COMPILER_FTEQCC, /* fteqcc QuakeC */ + COMPILER_QCCX, /* qccx QuakeC */ + COMPILER_GMQCC /* this QuakeC */ +}; +extern uint32_t opts_O; /* -Ox */ +extern const char *opts_output; /* -o file */ +extern int opts_standard; +extern bool opts_debug; +extern bool opts_memchk; + +/*===================================================================*/ +#define OPTS_FLAG(i) (!! (opts_flags[(i)/32] & (1<< ((i)%32)))) +extern uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; +#define OPTS_WARN(i) (!! (opts_warn[(i)/32] & (1<< ((i)%32)))) +extern uint32_t opts_warn[1 + (COUNT_WARNINGS / 32)]; + #endif