X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=gmqcc.h;h=a296e16523cd02f1663433ee52ab60d0572878f4;hp=6a56675683904297cf8bf9538fe5f37f9b46d777;hb=ae251d391464763fd8293efd65627f9f9fd56572;hpb=e8cc27df5b6adc7a88de48cac7444cab5822992e diff --git a/gmqcc.h b/gmqcc.h index 6a56675..a296e16 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -179,95 +179,6 @@ typedef char int64_size_is_correct [sizeof(int64_t) == 8?1:-1]; typedef char uintptr_size_is_correct[sizeof(intptr_t) == sizeof(int*)?1:-1]; typedef char intptr_size_is_correct [sizeof(uintptr_t)== sizeof(int*)?1:-1]; -/*===================================================================*/ -/*============================ lex.c ================================*/ -/*===================================================================*/ -typedef struct lex_file_t { - FILE *file; /* file handler */ - char *name; /* name of file */ - char peek [5]; - char lastok[8192]; - - int last; /* last token */ - int current; /* current token */ - int length; /* bytes left to parse */ - int size; /* never changes (size of file) */ - int line; /* what line are we on? */ -} lex_file; - -/* - * It's important that this table never exceed 32 keywords, the ascii - * table starts at 33 (and we don't want conflicts) - */ -enum { - TOKEN_DO , - TOKEN_ELSE , - TOKEN_IF , - TOKEN_WHILE , - TOKEN_BREAK , - TOKEN_CONTINUE , - TOKEN_RETURN , - TOKEN_GOTO , - TOKEN_FOR , /* extension */ - TOKEN_TYPEDEF , /* extension */ - - /* ensure the token types are out of the */ - /* bounds of anyothers that may conflict. */ - TOKEN_FLOAT = 110, - TOKEN_VECTOR , - TOKEN_STRING , - TOKEN_ENTITY , - TOKEN_VOID -}; - -/* - * Lexer state constants, these are numbers for where exactly in - * the lexing the lexer is at. Or where it decided to stop if a lexer - * error occurs. These numbers must be > where the ascii-table ends - * and > the last type token which is TOKEN_VOID - */ -enum { - LEX_COMMENT = 1128, - LEX_CHRLIT , - LEX_STRLIT , - LEX_IDENT -}; - -int lex_token (lex_file *); -void lex_reset (lex_file *); -void lex_close (lex_file *); -void lex_parse (lex_file *); -lex_file *lex_include(lex_file *, const char *); -void lex_init (const char *, lex_file **); - -/*===================================================================*/ -/*========================== error.c ================================*/ -/*===================================================================*/ -#define ERROR_LEX (SHRT_MAX+0) -#define ERROR_PARSE (SHRT_MAX+1) -#define ERROR_INTERNAL (SHRT_MAX+2) -#define ERROR_COMPILER (SHRT_MAX+3) -#define ERROR_PREPRO (SHRT_MAX+4) -int error(lex_file *, int, const char *, ...); - -/*===================================================================*/ -/*========================== parse.c ================================*/ -/*===================================================================*/ -int parse_gen(lex_file *); - -/*===================================================================*/ -/*========================== typedef.c ==============================*/ -/*===================================================================*/ -typedef struct typedef_node_t { - char *name; -} typedef_node; - -void typedef_init(); -void typedef_clear(); -typedef_node *typedef_find(const char *); -int typedef_add (lex_file *file, const char *, const char *); - - /*===================================================================*/ /*=========================== util.c ================================*/ /*===================================================================*/ @@ -287,6 +198,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 @@ -339,7 +253,7 @@ uint32_t util_crc32(const char *, int, register const short); while (N##_add(*++elements) != -1 && len--); \ return N##_elements; \ } \ - typedef char VECTOR_FILL(extra_semicolon_,__COUNTER__) + typedef char VECTOR_FILL(extra_semicolon_##N,__COUNTER__) #define VECTOR_PROT(T,N) \ extern T* N##_data ; \ extern long N##_elements ; \ @@ -364,14 +278,43 @@ enum { TYPE_FIELD , TYPE_FUNCTION , TYPE_POINTER , - /* TYPE_INTEGER , */ + TYPE_INTEGER , + TYPE_QUATERNION , + TYPE_MATRIX , TYPE_VARIANT , TYPE_COUNT }; +extern const char *type_name[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 @@ -457,8 +400,8 @@ enum { INSTR_DONE, INSTR_MUL_F, INSTR_MUL_V, - INSTR_MUL_FV, INSTR_MUL_VF, + INSTR_MUL_FV, INSTR_DIV_F, INSTR_ADD_F, INSTR_ADD_V, @@ -521,6 +464,23 @@ enum { INSTR_BITAND, INSTR_BITOR, +/* warning: will be reordered */ + INSTR_MUL_Q, + INSTR_MUL_QF, + INSTR_MUL_M, + INSTR_MUL_MF, + INSTR_EQ_Q, + INSTR_EQ_M, + INSTR_NE_Q, + INSTR_NE_M, + INSTR_LOAD_Q, + INSTR_LOAD_M, + INSTR_STORE_Q, + INSTR_STORE_M, + INSTR_STOREP_Q, + INSTR_STOREP_M, + INSTR_INV_Q, + INSTR_INV_M, /* * Virtual instructions used by the assembler * keep at the end but before virtual instructions @@ -556,6 +516,9 @@ 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 @@ -564,6 +527,7 @@ 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 =============================*/ @@ -576,8 +540,8 @@ static const struct { { "DONE" , 1, 4 }, { "MUL_F" , 3, 5 }, { "MUL_V" , 3, 5 }, - { "MUL_FV" , 3, 6 }, { "MUL_VF" , 3, 6 }, + { "MUL_FV" , 3, 6 }, { "DIV" , 0, 3 }, { "ADD_F" , 3, 5 }, { "ADD_V" , 3, 5 }, @@ -639,6 +603,24 @@ static const struct { { "OR" , 0, 2 }, { "BITAND" , 0, 6 }, { "BITOR" , 0, 5 }, + + { "MUL_Q" , 3, 5 }, + { "MUL_QF" , 3, 6 }, + { "MUL_M" , 3, 5 }, + { "MUL_MF" , 3, 6 }, + { "EQ_Q" , 0, 4 }, + { "EQ_M" , 0, 4 }, + { "NE_Q" , 0, 4 }, + { "NE_M" , 0, 4 }, + { "FIELD_Q" , 0, 7 }, + { "FIELD_M" , 0, 7 }, + { "STORE_Q" , 0, 7 }, + { "STORE_M" , 0, 7 }, + { "STOREP_Q" , 0, 8 }, + { "STOREP_M" , 0, 8 }, + { "INV_Q" , 0, 5 }, + { "INV_M" , 0, 5 }, + { "END" , 0, 3 } /* virtual assembler instruction */ }; @@ -646,20 +628,6 @@ 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) \ @@ -676,7 +644,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; \ @@ -698,7 +666,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; \ @@ -723,7 +691,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; \ @@ -738,7 +706,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) \ @@ -763,18 +781,29 @@ void Tself##_##mem##_clear(Tself *self) \ (owner)->mem##_alloc = 0; \ } +#define MEM_VECTOR_MOVE(from, mem, to, tm) \ +{ \ + (to)->tm = (from)->mem; \ + (to)->tm##_count = (from)->mem##_count; \ + (to)->tm##_alloc = (from)->mem##_alloc; \ + (from)->mem = NULL; \ + (from)->mem##_count = 0; \ + (from)->mem##_alloc = 0; \ +} + #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_param, /* parameters, they are locals with a fixed position */ store_value, /* unassignable */ store_return /* unassignable, at OFS_RETURN */ }; @@ -783,6 +812,14 @@ typedef struct { float x, y, z; } vector; +typedef float matrix[4][4]; /* OpenGL layout */ +typedef float quaternion[4]; /* order: x, y, z, w */ +#define MATRIX(axis, elem) ((4*(axis)) + (elem)) +#define QUAT_X 0 +#define QUAT_Y 1 +#define QUAT_Z 2 +#define QUAT_W 3 + /* * A shallow copy of a lex_file to remember where which ast node * came from. @@ -791,4 +828,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