X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=gmqcc.h;h=9770929f8caaa104e04255dd5246bd656f0112c4;hp=beca3504a3bb4a5448b2ade23797d6c1dcb9267d;hb=84088cb5f0e41a88e88b1af310a9ed12e56a038b;hpb=7e3edea6211832e76918e385f299b7198d4e209b diff --git a/gmqcc.h b/gmqcc.h index beca350..9770929 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -26,8 +26,20 @@ #include #include #include +#include #include +/* + * Disable some over protective warnings in visual studio because fixing them is a waste + * of my time. + */ +#ifdef _MSC_VER +# pragma warning(disable : 4244 ) /* conversion from 'int' to 'float', possible loss of data */ +# pragma warning(disable : 4018 ) /* signed/unsigned mismatch */ +# pragma warning(disable : 4996 ) /* This function or variable may be unsafe */ +# pragma warning(disable : 4700 ) /* uninitialized local variable used */ +#endif + #define GMQCC_VERSION_MAJOR 0 #define GMQCC_VERSION_MINOR 1 #define GMQCC_VERSION_PATCH 0 @@ -134,31 +146,26 @@ #if INT_MAX == 0x7FFFFFFF typedef int int32_t; typedef unsigned int uint32_t; - typedef long int64_t; - typedef unsigned long uint64_t; #elif LONG_MAX == 0x7FFFFFFF typedef long int32_t; typedef unsigned long uint32_t; +#endif + +#if defined(__GNUC__) || defined (__CLANG__) + typedef int int64_t __attribute__((__mode__(__DI__))); + typedef unsigned int uint64_t __attribute__((__mode__(__DI__))); +#elif defined(_MSC_VER) + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; +#else /* - * 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 + * 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 #ifdef _LP64 /* long pointer == 64 */ typedef unsigned long uintptr_t; @@ -174,7 +181,7 @@ 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]; typedef char int32_size_is_correct [sizeof(int32_t) == 4?1:-1]; -typedef char int64_size_is_correct [sizeof(int64_t) == 8?1:-1]; +typedef char int64_size_is_correct [sizeof(int64_t) >= 8?1:-1]; /* intptr_t / uintptr_t correct size check */ 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]; @@ -182,6 +189,8 @@ typedef char intptr_size_is_correct [sizeof(uintptr_t)== sizeof(int*)?1:-1]; /*===================================================================*/ /*=========================== util.c ================================*/ /*===================================================================*/ +FILE *util_fopen(const char *filename, const char *mode); + void *util_memory_a (unsigned int, unsigned int, const char *); void util_memory_d (void *, unsigned int, const char *); void util_meminfo (); @@ -201,7 +210,8 @@ 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); +uint16_t util_crc16(uint16_t crc, const char *data, size_t len); +uint32_t util_crc32(uint32_t crc, const char *data, size_t len); #ifdef NOTRACK # define mem_a(x) malloc(x) @@ -280,6 +290,9 @@ enum { TYPE_POINTER , TYPE_INTEGER , TYPE_VARIANT , + TYPE_STRUCT , + TYPE_UNION , + TYPE_ARRAY , TYPE_COUNT }; @@ -288,12 +301,16 @@ extern const char *type_name[TYPE_COUNT]; extern size_t type_sizeof[TYPE_COUNT]; extern uint16_t type_store_instr[TYPE_COUNT]; +extern uint16_t field_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]; +/* other useful lists */ +extern uint16_t type_eq_instr[TYPE_COUNT]; +extern uint16_t type_ne_instr[TYPE_COUNT]; typedef struct { uint32_t offset; /* Offset in file of where data begins */ @@ -378,6 +395,10 @@ typedef struct { typedef prog_section_both prog_section_def; typedef prog_section_both prog_section_field; +/* this is ORed to the type */ +#define DEF_SAVEGLOBAL (1<<15) +#define DEF_TYPEMASK ((1<<15)-1) + typedef struct { int32_t entry; /* in statement table for instructions */ uint32_t firstlocal; /* First local in local table */ @@ -398,8 +419,8 @@ enum { INSTR_DONE, INSTR_MUL_F, INSTR_MUL_V, - INSTR_MUL_FV, - INSTR_MUL_VF, + INSTR_MUL_FV, /* NOTE: the float operands must NOT be at the same locations: A != C */ + INSTR_MUL_VF, /* and here: B != C */ INSTR_DIV_F, INSTR_ADD_F, INSTR_ADD_V, @@ -496,6 +517,7 @@ VECTOR_PROT(prog_section_field, code_fields ); VECTOR_PROT(prog_section_function, code_functions ); VECTOR_PROT(int, code_globals ); VECTOR_PROT(char, code_chars ); +extern uint16_t code_crc; typedef float qcfloat; typedef int32_t qcint; @@ -510,6 +532,19 @@ uint32_t code_genstring (const char *string); uint32_t code_cachedstring(const char *string); qcint code_alloc_field (size_t qcsize); +/*===================================================================*/ +/*============================ con.c ================================*/ +/*===================================================================*/ +void con_close(); +void con_color(int state); +void con_init (); +void con_reset(); +int con_change(const char *out, const char *err); +int con_verr (const char *fmt, va_list va); +int con_vout (const char *fmt, va_list va); +int con_err (const char *fmt, ...); +int con_out (const char *fmt, ...); + /*===================================================================*/ /*========================= assembler.c =============================*/ /*===================================================================*/ @@ -527,7 +562,7 @@ static const struct { { "ADD_F" , 3, 5 }, { "ADD_V" , 3, 5 }, { "SUB_F" , 3, 5 }, - { "DUB_V" , 3, 5 }, + { "SUB_V" , 3, 5 }, { "EQ_F" , 0, 4 }, { "EQ_V" , 0, 4 }, { "EQ_S" , 0, 4 }, @@ -587,10 +622,6 @@ static const struct { { "END" , 0, 3 } /* virtual assembler instruction */ }; - -void asm_init (const char *, FILE **); -void asm_close(FILE *); -void asm_parse(FILE *); /*===================================================================*/ /*============================= ast.c ===============================*/ /*===================================================================*/ @@ -674,22 +705,26 @@ bool GMQCC_WARN Tself##_##mem##_find(Tself *self, Twhat obj, size_t *idx) \ bool GMQCC_WARN Tself##_##mem##_append(Tself *s, Twhat *p, size_t c) \ { \ Twhat *reall; \ - if (s->mem##_count+c >= s->mem##_alloc) { \ + size_t oldalloc; \ + if (s->mem##_count+c > s->mem##_alloc) { \ if (!s->mem##_alloc) { \ s->mem##_alloc = c < 16 ? 16 : c; \ + s->mem = (Twhat*)mem_a(sizeof(Twhat) * s->mem##_alloc); \ } else { \ + oldalloc = s->mem##_alloc; \ 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) { \ + s->mem##_alloc = oldalloc; \ + return false; \ + } \ + memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count); \ + mem_d(s->mem); \ + s->mem = reall; \ } \ - 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; \ @@ -705,6 +740,7 @@ bool GMQCC_WARN Tself##_##mem##_resize(Tself *s, size_t c) \ if (!reall) { return false; } \ memcpy(reall, s->mem, sizeof(Twhat) * s->mem##_count); \ s->mem##_alloc = c; \ + s->mem##_count = c; \ mem_d(s->mem); \ s->mem = reall; \ return true; \ @@ -716,6 +752,7 @@ bool GMQCC_WARN Tself##_##mem##_resize(Tself *s, size_t c) \ memcpy(reall, s->mem, sizeof(Twhat) * c); \ mem_d(s->mem); \ s->mem = reall; \ + s->mem##_alloc = c; \ } \ return true; \ } @@ -773,9 +810,14 @@ enum store_types { }; typedef struct { - float x, y, z; + qcfloat x, y, z; } vector; +vector vec3_add (vector, vector); +vector vec3_sub (vector, vector); +qcfloat vec3_mulvv(vector, vector); +vector vec3_mulvf(vector, float); + /* * A shallow copy of a lex_file to remember where which ast node * came from. @@ -843,6 +885,10 @@ typedef struct qc_program_s { MEM_VECTOR_MAKE(qcint, entitydata); MEM_VECTOR_MAKE(bool, entitypool); + MEM_VECTOR_MAKE(const char*, function_stack); + + uint16_t crc16; + size_t tempstring_start; size_t tempstring_at; @@ -861,6 +907,8 @@ typedef struct qc_program_s { MEM_VECTOR_MAKE(qc_exec_stack, stack); size_t statement; + size_t xflags; + int argc; /* current arg count for debugging */ } qc_program; @@ -875,6 +923,43 @@ 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); +/*===================================================================*/ +/*===================== error.c message printer =====================*/ +/*===================================================================*/ + +#ifndef WIN32 +enum { + CON_BLACK = 30, + CON_RED, + CON_GREEN, + CON_BROWN, + CON_BLUE, + CON_MAGENTA, + CON_CYAN , + CON_WHITE +}; +#endif +enum { + LVL_MSG, + LVL_WARNING, + LVL_ERROR +}; + +void vprintmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap); +void printmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, ...); +void cvprintmsg(lex_ctx ctx, int lvl, const char *msgtype, const char *msg, va_list ap); +void cprintmsg (lex_ctx ctx, int lvl, const char *msgtype, const char *msg, ...); + +/*===================================================================*/ +/*===================== parser.c commandline ========================*/ +/*===================================================================*/ + +bool parser_init (); +bool parser_compile_file (const char *filename); +bool parser_compile_string(const char *name, const char *str); +bool parser_finish (const char *output); +void parser_cleanup (); + /*===================================================================*/ /*======================= main.c commandline ========================*/ /*===================================================================*/ @@ -902,28 +987,28 @@ typedef struct { /*===================================================================*/ /* list of -f flags, like -fdarkplaces-string-table-bug */ enum { +# define GMQCC_TYPE_FLAGS # define GMQCC_DEFINE_FLAG(X) X, -# include "flags.def" -# undef GMQCC_DEFINE_FLAG +# include "opts.def" COUNT_FLAGS }; static const opts_flag_def opts_flag_list[] = { +# define GMQCC_TYPE_FLAGS # define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) }, -# include "flags.def" -# undef GMQCC_DEFINE_FLAG +# include "opts.def" { NULL, LONGBIT(0) } }; enum { +# define GMQCC_TYPE_WARNS # define GMQCC_DEFINE_FLAG(X) WARN_##X, -# include "warns.def" -# undef GMQCC_DEFINE_FLAG +# include "opts.def" COUNT_WARNINGS }; static const opts_flag_def opts_warn_list[] = { +# define GMQCC_TYPE_WARNS # define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(WARN_##X) }, -# include "warns.def" -# undef GMQCC_DEFINE_FLAG +# include "opts.def" { NULL, LONGBIT(0) } }; @@ -939,6 +1024,12 @@ extern const char *opts_output; /* -o file */ extern int opts_standard; extern bool opts_debug; extern bool opts_memchk; +extern bool opts_dump; +extern bool opts_werror; +extern bool opts_forcecrc; +extern uint16_t opts_forced_crc; +extern bool opts_pp_only; +extern size_t opts_max_array_size; /*===================================================================*/ #define OPTS_FLAG(i) (!! (opts_flags[(i)/32] & (1<< ((i)%32))))