X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=gmqcc.h;h=c953b02a0ed047e2ec6cae16aae926c452cdf0af;hb=af5b552a7f08b0115f620d999043e5722d6cdadb;hp=5b240a4b5a59fb47c9892ccf0c616d9dc18e18ca;hpb=7753e19ba88f799be464f93949c2d03532789b3a;p=xonotic%2Fgmqcc.git diff --git a/gmqcc.h b/gmqcc.h index 5b240a4..c953b02 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -26,8 +26,8 @@ #include #include #include -#include #include +#include #include /* @@ -35,15 +35,12 @@ * 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 */ -# pragma warning(disable : 4129 ) /* unrecognized character secape sequence */ +# pragma warning(disable : 4244 ) /* conversion from 'int' to 'float', possible loss of data */ +# pragma warning(disable : 4018 ) /* signed/unsigned mismatch */ #endif #define GMQCC_VERSION_MAJOR 0 -#define GMQCC_VERSION_MINOR 2 +#define GMQCC_VERSION_MINOR 3 #define GMQCC_VERSION_PATCH 0 #define GMQCC_VERSION_BUILD(J,N,P) (((J)<<16)|((N)<<8)|(P)) #define GMQCC_VERSION \ @@ -156,12 +153,11 @@ * just plain textual subsitution. */ #ifdef _MSC_VER -# define snprintf(X, Y, Z, ...) _snprintf(X, Y, Z, __VA_ARGS__) +# define snprintf(X, Y, Z, ...) _snprintf(X, Y, Z, __VA_ARGS__) /* strtof doesn't exist -> strtod does though :) */ -# define strtof(X, Y) (float)(strtod(X, Y)) +# define strtof(X, Y) (float)(strtod(X, Y)) #endif - /* * Very roboust way at determining endianess at compile time: this handles * almost every possible situation. Otherwise a runtime check has to be @@ -247,8 +243,6 @@ /*===================================================================*/ /*=========================== util.c ================================*/ /*===================================================================*/ -FILE *util_fopen(const char *filename, const char *mode); - void *util_memory_a (size_t, unsigned int, const char *); void util_memory_d (void *, unsigned int, const char *); void *util_memory_r (void *, size_t, unsigned int, const char *); @@ -257,93 +251,63 @@ void util_meminfo (); bool util_filexists (const char *); 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 *); -char *util_strsws (const char *); -char *util_strchp (const char *, const char *); void util_debug (const char *, const char *, ...); -int util_getline (char **, size_t *, FILE *); void util_endianswap (void *, size_t, unsigned int); size_t util_strtocmd (const char *, char *, size_t); size_t util_strtononcmd (const char *, char *, size_t); 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); -/* - * If we're compiling as C++ code we need to fix some subtle issues regarding casts between mem_a/mem_d - * since C++ doesn't allow implicit conversions between void* - */ -#ifdef __cplusplus - /* - * void * will be implicitally converted to gmqcc_voidptr using gmqcc_voidptr(void*). This is what - * essentially allows us to allow implicit conversion to whatever pointer type we're trying to assign - * to because it acks as a default assignment constructor. - */ - class gmqcc_voidptr { - void *m_pointer; - public: - gmqcc_voidptr(void *pointer) : - m_pointer(pointer) - { }; - - template - GMQCC_INLINE operator T *() { - return m_pointer; - } - }; - -# define GMQCC_IMPLICIT_POINTER(X) (gmqcc_voidptr(X)) -#else -# define GMQCC_IMPLICIT_POINTER(X) (X) -#endif +void util_seed(uint32_t); +uint32_t util_rand(); #ifdef NOTRACK -# define mem_a(x) GMQCC_IMPLICIT_POINTER(malloc (x)) +# define mem_a(x) malloc (x) # define mem_d(x) free ((void*)x) # define mem_r(x, n) realloc((void*)x, n) #else -# define mem_a(x) GMQCC_IMPLICIT_POINTER(util_memory_a((x), __LINE__, __FILE__)) +# define mem_a(x) util_memory_a((x), __LINE__, __FILE__) # define mem_d(x) util_memory_d((void*)(x), __LINE__, __FILE__) # define mem_r(x, n) util_memory_r((void*)(x), (n), __LINE__, __FILE__) #endif -/* New flexible vector implementation from Dale */ -#define _vec_raw(A) (((size_t*)(void*)(A)) - 2) -#define _vec_beg(A) (_vec_raw(A)[0]) -#define _vec_end(A) (_vec_raw(A)[1]) -#define _vec_needsgrow(A,N) ((!(A)) || (_vec_end(A) + (N) >= _vec_beg(A))) -#define _vec_mightgrow(A,N) (_vec_needsgrow((A), (N)) ? (void)_vec_forcegrow((A),(N)) : (void)0) -#define _vec_forcegrow(A,N) _util_vec_grow(((void**)&(A)), (N), sizeof(*(A))) -#define _vec_remove(A,S,I,N) (memmove((char*)(A)+(I)*(S),(char*)(A)+((I)+(N))*(S),(S)*(_vec_end(A)-(I)-(N))), _vec_end(A)-=(N)) +/* + * A flexible vector implementation: all vector pointers contain some + * data about themselfs exactly - sizeof(vector_t) behind the pointer + * this data is represented in the structure below. Doing this allows + * us to use the array [] to access individual elements from the vector + * opposed to using set/get methods. + */ +typedef struct { + size_t allocated; + size_t used; + + /* can be extended now! whoot */ +} vector_t; + +/* hidden interface */ void _util_vec_grow(void **a, size_t i, size_t s); +#define GMQCC_VEC_WILLGROW(X,Y) ( \ + ((!(X) || vec_meta(X)->used + Y >= vec_meta(X)->allocated)) ? \ + (void)_util_vec_grow(((void**)&(X)), (Y), sizeof(*(X))) : \ + (void)0 \ +) /* exposed interface */ -#define vec_free(A) ((A) ? (mem_d((void*)_vec_raw(A)), (A) = NULL) : 0) -#define vec_push(A,V) (_vec_mightgrow((A),1), (A)[_vec_end(A)++] = (V)) -#define vec_size(A) ((A) ? _vec_end(A) : 0) -#define vec_add(A,N) (_vec_mightgrow((A),(N)), _vec_end(A)+=(N), &(A)[_vec_end(A)-(N)]) -#define vec_last(A) ((A)[_vec_end(A)-1]) -#define vec_append(A,N,S) memcpy(vec_add((A), (N)), (S), N * sizeof(*(S))) -#define vec_remove(A,I,N) _vec_remove((A), sizeof(*(A)), (I), (N)) -#define vec_pop(A) (_vec_end(A)-=1) - -/* these are supposed to NOT reallocate */ -#define vec_shrinkto(A,N) (_vec_end(A) = (N)) -#define vec_shrinkby(A,N) (_vec_end(A) -= (N)) - -/* vec_upload needs to be cleaned up as well to be a function */ -#define vec_upload(X,Y,S) \ - do { \ - size_t E = 0; \ - while (E < S) { \ - vec_push(X, Y[E]); \ - E ++; \ - } \ - } while(0) +#define vec_meta(A) (((vector_t*)(A)) - 1) +#define vec_free(A) ((A) ? (mem_d((void*)vec_meta(A)), (A) = NULL) : 0) +#define vec_push(A,V) (GMQCC_VEC_WILLGROW((A),1), (A)[vec_meta(A)->used++] = (V)) +#define vec_size(A) ((A) ? vec_meta(A)->used : 0) +#define vec_add(A,N) (GMQCC_VEC_WILLGROW((A),(N)), vec_meta(A)->used += (N), &(A)[vec_meta(A)->used-(N)]) +#define vec_last(A) ((A)[vec_meta(A)->used - 1]) +#define vec_pop(A) (vec_meta(A)->used -= 1) +#define vec_shrinkto(A,N) (vec_meta(A)->used = (N)) +#define vec_shrinkby(A,N) (vec_meta(A)->used -= (N)) +#define vec_append(A,N,S) memcpy(vec_add((A), (N)), (S), (N) * sizeof(*(S))) +#define vec_upload(X,Y,S) memcpy(vec_add((X), (S) * sizeof(*(Y))), (Y), (S) * sizeof(*(Y))) +#define vec_remove(A,I,N) memmove((A)+(I),(A)+((I)+(N)),sizeof(*(A))*(vec_meta(A)->used-(I)-(N))),vec_meta(A)->used-=(N) typedef struct hash_table_t { size_t size; @@ -382,15 +346,34 @@ typedef struct hash_table_t { */ hash_table_t *util_htnew (size_t size); void util_htset (hash_table_t *ht, const char *key, void *value); -void *util_htget (hash_table_t *ht, const char *key); void util_htdel (hash_table_t *ht); size_t util_hthash(hash_table_t *ht, const char *key); -void *util_htgeth(hash_table_t *ht, const char *key, size_t hash); void util_htseth(hash_table_t *ht, const char *key, size_t hash, void *value); + +void *util_htget (hash_table_t *ht, const char *key); +void *util_htgeth(hash_table_t *ht, const char *key, size_t hash); +/*===================================================================*/ +/*============================ file.c ===============================*/ +/*===================================================================*/ +GMQCC_INLINE void file_close (FILE *); +GMQCC_INLINE int file_error (FILE *); +GMQCC_INLINE int file_getc (FILE *); +GMQCC_INLINE int file_printf (FILE *, const char *, ...); +GMQCC_INLINE int file_puts (FILE *, const char *); +GMQCC_INLINE int file_seek (FILE *, long int, int); + +GMQCC_INLINE size_t file_read (void *, size_t, size_t, FILE *); +GMQCC_INLINE size_t file_write (const void *, size_t, size_t, FILE *); + +GMQCC_INLINE FILE *file_open (const char *, const char *); +/*NOINLINE*/ int file_getline(char **, size_t *, FILE *); + + /*===================================================================*/ /*=========================== code.c ================================*/ /*===================================================================*/ +/* TODO: cleanup */ /* Note: if you change the order, fix type_sizeof in ir.c */ enum { TYPE_VOID , @@ -646,7 +629,6 @@ typedef int32_t qcint; bool code_write (const char *filename, const char *lno); void code_init (); uint32_t code_genstring (const char *string); -uint32_t code_cachedstring(const char *string); qcint code_alloc_field (size_t qcsize); /* this function is used to keep statements and linenumbers together */ @@ -683,6 +665,9 @@ enum { LVL_ERROR }; +FILE *con_default_out(); +FILE *con_default_err(); + void con_vprintmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, va_list ap); void con_printmsg (int level, const char *name, size_t line, const char *msgtype, const char *msg, ...); void con_cvprintmsg(void *ctx, int lvl, const char *msgtype, const char *msg, va_list ap); @@ -810,6 +795,7 @@ vector vec3_mulvf(vector, float); /*============================= exec.c ==============================*/ /*===================================================================*/ +/* TODO: cleanup */ /* * Darkplaces has (or will have) a 64 bit prog loader * where the 32 bit qc program is autoconverted on load. @@ -910,24 +896,22 @@ qcint prog_tempstring(qc_program *prog, const char *_str); /*===================================================================*/ 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); +bool parser_compile_file (const char *); +bool parser_compile_string(const char *, const char *, size_t); +bool parser_finish (const char *); void parser_cleanup (); -/* There's really no need to strlen() preprocessed files */ -bool parser_compile_string_len(const char *name, const char *str, size_t len); /*===================================================================*/ /*====================== ftepp.c commandline ========================*/ /*===================================================================*/ -bool ftepp_init (); -bool ftepp_preprocess_file (const char *filename); -bool ftepp_preprocess_string(const char *name, const char *str); -void ftepp_finish (); -const char *ftepp_get (); -void ftepp_flush (); -void ftepp_add_define (const char *source, const char *name); -void ftepp_add_macro (const char *name, const char *value); +bool ftepp_init (); +bool ftepp_preprocess_file (const char *filename); +bool ftepp_preprocess_string(const char *name, const char *str); +void ftepp_finish (); +const char *ftepp_get (); +void ftepp_flush (); +void ftepp_add_define (const char *source, const char *name); +void ftepp_add_macro (const char *name, const char *value); /*===================================================================*/ /*======================= main.c commandline ========================*/ @@ -947,6 +931,18 @@ typedef uint32_t longbit; #define LONGBIT(bit) (bit) #endif +/*===================================================================*/ +/*=========================== utf8lib.c =============================*/ +/*===================================================================*/ +typedef uint32_t uchar_t; + +bool u8_analyze (const char *_s, size_t *_start, size_t *_len, uchar_t *_ch, size_t _maxlen); +size_t u8_strlen (const char*); +size_t u8_strnlen (const char*, size_t); +uchar_t u8_getchar (const char*, const char**); +uchar_t u8_getnchar(const char*, const char**, size_t); +int u8_fromchar(uchar_t w, char *to, size_t maxlen); + /*===================================================================*/ /*============================= opts.c ==============================*/ /*===================================================================*/ @@ -1019,9 +1015,11 @@ typedef enum { COMPILER_GMQCC /* this QuakeC */ } opts_std_t; +/* TODO: cleanup this */ typedef struct { uint32_t O; /* -Ox */ const char *output; /* -o file */ + bool quiet; /* -q --quiet */ bool g; /* -g */ opts_std_t standard; /* -std= */ bool debug; /* -debug */ @@ -1041,7 +1039,6 @@ typedef struct { extern opts_cmd_t opts; -/*===================================================================*/ #define OPTS_FLAG(i) (!! (opts.flags [(i)/32] & (1<< ((i)%32)))) #define OPTS_WARN(i) (!! (opts.warn [(i)/32] & (1<< ((i)%32)))) #define OPTS_WERROR(i) (!! (opts.werror [(i)/32] & (1<< ((i)%32))))