-/*
- * Copyright (C) 2012
- * Dale Weiler
- * Wolfgang Bumiller
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is furnished to do
- * so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
#ifndef GMQCC_HDR
#define GMQCC_HDR
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
+#include <vector>
+#include <string>
+#include <utility>
+#include <memory>
+using std::move;
#include <stdarg.h>
+#include <stddef.h>
+#include <stdlib.h>
#include <stdio.h>
-#include <ctype.h>
-
-/*
- * 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 */
-#endif
+#include <time.h>
#define GMQCC_VERSION_MAJOR 0
#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 \
- GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
-
-/*
- * We cannoy rely on C99 at all, since compilers like MSVC
- * simply don't support it. We define our own boolean type
- * as a result (since we cannot include <stdbool.h>). For
- * compilers that are in 1999 mode (C99 compliant) we can use
- * the language keyword _Bool which can allow for better code
- * on GCC and GCC-like compilers, opposed to `int`.
- */
-#ifndef __cplusplus
-# ifdef false
-# undef false
-# endif /* !false */
-# ifdef true
-# undef true
-# endif /* !true */
-# define false (0)
-# define true (1)
-# 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
- * that the result isn't ignored. To find such function calls,
- * we use this macro.
- */
-#if defined(__GNUC__) || defined(__CLANG__)
-# define GMQCC_WARN __attribute__((warn_unused_result))
+#define GMQCC_VERSION_PATCH 6
+#define GMQCC_VERSION ((GMQCC_VERSION_MAJOR<<16)|(GMQCC_VERSION_MINOR<<8)|GMQCC_VERSION_PATCH)
+
+#ifdef GMQCC_VERSION_TYPE_RELEASE
+# ifdef GMQCC_GITINFO
+# define GMQCC_DEV_VERSION_STRING "git build: " GMQCC_GITINFO "\n"
+# elif defined(GMQCC_VERSION_TYPE_DEVEL)
+# define GMQCC_DEV_VERSION_STRING "development build\n"
+# else
+# define GMQCC_DEV_VERSION_STRING
+# endif /*! GMQCC_GITINGO */
#else
-# define GMQCC_WARN
+# define GMQCC_DEV_VERSION_STRING
#endif
-/*
- * This is a hack to silent clang regarding empty
- * body if statements.
- */
-#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.
- */
-#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
-# endif
-# else
-# define GMQCC_INLINE inline
-# endif
-/*
- * Visual studio has __forcinline we can use. So lets use that
- * I suspect it also has just __inline of some sort, but our use
- * of inline is correct (not guessed), WE WANT IT TO BE INLINE
- */
-#elif defined(_MSC_VER)
-# define GMQCC_INLINE __forceinline
-#else
-# define GMQCC_INLINE
-#endif /* !__STDC_VERSION__ */
+#define GMQCC_STRINGIFY(x) #x
+#define GMQCC_IND_STRING(x) GMQCC_STRINGIFY(x)
+#define GMQCC_FULL_VERSION_STRING \
+"GMQCC " \
+GMQCC_IND_STRING(GMQCC_VERSION_MAJOR) "." \
+GMQCC_IND_STRING(GMQCC_VERSION_MINOR) "." \
+GMQCC_IND_STRING(GMQCC_VERSION_PATCH) \
+" Built " __DATE__ " " __TIME__ \
+"\n" GMQCC_DEV_VERSION_STRING
-/*
- * 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
+#ifndef __cplusplus
+# define false (unsigned char)(0)
+# define true (unsigned char)(1)
+ typedef unsigned char bool;
#endif
-#ifndef _MSC_VER
+#if defined(__GNUC__) || defined(__CLANG__)
# include <stdint.h>
+# if (__GNUC__ >= 2) || defined(__CLANG__)
+# define GMQCC_NORETURN __attribute__((noreturn))
+# define GMQCC_FORCEINLINE __attribute__((always_inline))
+# define GMQCC_INLINE __inline
+# endif
+# define GMQCC_LIKELY(X) __builtin_expect((X), 1)
+# define GMQCC_UNLIKELY(X) __builtin_expect((X), 0)
+# define GMQCC_WARN __attribute__((warn_unused_result))
+# define GMQCC_USED __attribute__((used))
+# define GMQCC_RESTRICT __restrict__
#else
- typedef unsigned __int8 uint8_t;
- typedef unsigned __int16 uint16_t;
- typedef unsigned __int32 uint32_t;
- typedef unsigned __int64 uint64_t;
-
- typedef __int16 int16_t;
- typedef __int32 int32_t;
- typedef __int64 int64_t;
-#endif
-
-/*
- *windows makes these prefixed because they're C99
- * TODO: utility versions that are type-safe and not
- * just plain textual subsitution.
- */
-#ifdef _MSC_VER
-# 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))
+# ifdef _MSC_VER
+ /* conversion from 'int' to 'float', possible loss of data */
+# pragma warning(disable : 4244)
+
+ typedef unsigned __int8 uint8_t;
+ typedef unsigned __int16 uint16_t;
+ typedef unsigned __int32 uint32_t;
+ typedef unsigned __int64 uint64_t;
+ typedef __int16 int16_t;
+ typedef __int32 int32_t;
+ typedef __int64 int64_t;
+# define GMQCC_NORETURN __declspec(noreturn)
+# define GMQCC_FORCEINLINE __forceinline
+# define GMQCC_INLINE __inline
+# define GMQCC_RESTRICT __restrict
+# else
+# define GMQCC_NORETURN
+# define GMQCC_FORCEINLINE
+# define GMQCC_INLINE
+# define GMQCC_RESTRICT
+# endif
+# define GMQCC_LIKELY(X) (X)
+# define GMQCC_UNLIKELY(X) (X)
+# define GMQCC_WARN
+# define GMQCC_USED
#endif
-/*
- * Very roboust way at determining endianess at compile time: this handles
- * almost every possible situation. Otherwise a runtime check has to be
- * performed.
- */
#define GMQCC_BYTE_ORDER_LITTLE 1234
#define GMQCC_BYTE_ORDER_BIG 4321
# if defined (__FreeBSD__) || defined (__OpenBSD__)
# include <sys/endian.h>
# elif defined (BSD) && (BSD >= 199103) || defined (__DJGPP__) || defined (__CYGWIN32__)
-# include <machine/endiane.h>
+# include <machine/endian.h>
# elif defined (__APPLE__)
# if defined (__BIG_ENDIAN__) && !defined(BIG_ENDIAN)
# define BIG_ENDIAN
# elif defined (__LITTLE_ENDIAN__) && !defined (LITTLE_ENDIAN)
# define LITTLE_ENDIAN
-# endif
+# endif /*! defined (__BIG_ENDIAN__) && !defined(BIG_ENDIAN) */
# elif !defined (__MINGW32__)
# include <endian.h>
# if !defined (__BEOS__)
# include <byteswap.h>
-# endif
-# endif
-#endif
+# endif /*! !definde (__BEOS__) */
+# endif /*! defined (__FreeBSD__) || defined (__OpenBSD__) */
+#endif /*! defined (__GNUC__) || defined (__GNU_LIBRARY__) */
#if !defined(PLATFORM_BYTE_ORDER)
# if defined (LITTLE_ENDIAN) || defined (BIG_ENDIAN)
# if defined (LITTLE_ENDIAN) && !defined(BIG_ENDIAN)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
# elif defined (BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
-# endif
+# endif /*! defined (LITTLE_ENDIAN) && !defined(BIG_ENDIAN) */
# elif defined (_LITTLE_ENDIAN) || defined (_BIG_ENDIAN)
# if defined (_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
# elif defined (_BYTE_ORDER) && (_BYTE_ORDER == _BIG_ENDIAN)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
-# endif
+# endif /*! defined (_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN) */
# elif defined (__LITTLE_ENDIAN__) || defined (__BIG_ENDIAN__)
# if defined (__LITTLE_ENDIAN__) && !defined (__BIG_ENDIAN__)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
# elif defined (__BYTE_ORDER__) && (__BYTE_ORDER__ == __BIG_ENDIAN__)
# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
-# endif
-# endif
-#endif
+# endif /*! defined (__LITTLE_ENDIAN__) && !defined (__BIG_ENDIAN__) */
+# endif /*! defined(LITTLE_ENDIAN) || defined (BIG_ENDIAN) */
+#endif /*! !defined(PLATFORM_BYTE_ORDER) */
#if !defined (PLATFORM_BYTE_ORDER)
# if defined (__alpha__) || defined (__alpha) || defined (i386) || \
defined (__i386__) || defined (_M_I86) || defined (_M_IX86) || \
# endif
#endif
+#define GMQCC_ARRAY_COUNT(X) (sizeof(X) / sizeof((X)[0]))
+
+/* stat.c */
+char *stat_mem_strdup(const char *, bool);
+#define mem_a(SIZE) malloc(SIZE)
+#define mem_d(PTRN) free((void*)PTRN)
+#define mem_r(PTRN, SIZE) realloc((void*)PTRN, SIZE)
-/*===================================================================*/
-/*=========================== util.c ================================*/
-/*===================================================================*/
-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 *);
-void util_meminfo ();
+#define util_strdup(SRC) stat_mem_strdup((char*)(SRC), false)
+#define util_strdupe(SRC) stat_mem_strdup((char*)(SRC), true)
-bool util_filexists (const char *);
-bool util_strupper (const char *);
-bool util_strdigit (const char *);
-char *util_strdup (const char *);
-void util_debug (const char *, const char *, ...);
-void util_endianswap (void *, size_t, unsigned int);
+#define util_isalpha(a) ((((unsigned)(a)|32)-'a') < 26)
+#define util_isdigit(a) (((unsigned)(a)-'0') < 10)
+#define util_islower(a) (((unsigned)(a)-'a') < 26)
+#define util_isupper(a) (((unsigned)(a)-'A') < 26)
+#define util_isprint(a) (((unsigned)(a)-0x20) < 0x5F)
+#define util_isspace(a) (((a) >= 9 && (a) <= 13) || (a) == ' ')
-size_t util_strtocmd (const char *, char *, size_t);
-size_t util_strtononcmd (const char *, char *, size_t);
+bool util_strupper(const char *);
+bool util_strdigit(const char *);
+
+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);
+size_t util_optimizationtostr(const char *, char *, size_t);
uint16_t util_crc16(uint16_t crc, const char *data, size_t len);
-#ifdef NOTRACK
-# 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) 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
+void util_seed(uint32_t);
+uint32_t util_rand(void);
+
+int util_asprintf (char **ret, const char *fmt, ...);
+int util_sscanf (const char *str, const char *format, ...);
+char *util_strncpy (char *dest, const char *src, size_t n);
+char *util_strncat (char *dest, const char *src, size_t n);
+char *util_strcat (char *dest, const char *src);
+const char *util_strerror(int err);
+
+const struct tm *util_localtime(const time_t *timer);
+const char *util_ctime (const time_t *timer);
+
+bool util_isatty(FILE *);
+size_t hash(const char *key);
/*
* A flexible vector implementation: all vector pointers contain some
* 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 {
+ */
+struct vector_t {
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) ( \
+void _util_vec_delete(void *vec);
+
+#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_meta(A) (((vector_t*)(A)) - 1)
-#define vec_free(A) ((A) ? (mem_d((void*)vec_meta(A)), (A) = NULL) : 0)
+#define vec_meta(A) ((vector_t*)(((char *)(A)) - sizeof(vector_t)))
+#define vec_free(A) ((void)((A) ? (_util_vec_delete((void *)(A)), (A) = nullptr) : 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 {
+#define vec_pop(A) ((void)(vec_meta(A)->used -= 1))
+#define vec_shrinkto(A,N) ((void)(vec_meta(A)->used = (N)))
+#define vec_shrinkby(A,N) ((void)(vec_meta(A)->used -= (N)))
+#define vec_append(A,N,S) ((void)(memcpy(vec_add((A), (N)), (S), (N) * sizeof(*(S)))))
+#define vec_remove(A,I,N) ((void)(memmove((A)+(I),(A)+((I)+(N)),sizeof(*(A))*(vec_meta(A)->used-(I)-(N))),vec_meta(A)->used-=(N)))
+
+typedef struct hash_table_s {
size_t size;
struct hash_node_t **table;
} hash_table_t, *ht;
-/*
- * hashtable implementation:
- *
- * Note:
- * This was designed for pointers: you manage the life of the object yourself
- * if you do use this for non-pointers please be warned that the object may not
- * be valid if the duration of it exceeds (i.e on stack). So you need to allocate
- * yourself, or put those in global scope to ensure duration is for the whole
- * runtime.
- *
- * util_htnew(size) -- to make a new hashtable
- * util_htset(table, key, value, sizeof(value)) -- to set something in the table
- * util_htget(table, key) -- to get something from the table
- * util_htdel(table) -- to delete the table
- *
- * example of use:
- *
- * ht foo = util_htnew(1024);
- * int data = 100;
- * char *test = "hello world\n";
- * util_htset(foo, "foo", (void*)&data);
- * util_gtset(foo, "bar", (void*)test);
- *
- * printf("foo: %d, bar %s",
- * *((int *)util_htget(foo, "foo")),
- * ((char*)util_htget(foo, "bar"))
- * );
- *
- * util_htdel(foo);
- */
hash_table_t *util_htnew (size_t size);
-void util_htset (hash_table_t *ht, const char *key, void *value);
-void util_htdel (hash_table_t *ht);
-size_t util_hthash(hash_table_t *ht, const char *key);
-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 ================================*/
-/*===================================================================*/
+void util_htrem(hash_table_t *ht, void (*callback)(void *data));
+void util_htset(hash_table_t *ht, const char *key, void *value);
+void util_htdel(hash_table_t *ht);
+size_t util_hthash(hash_table_t *ht, const char *key);
+void util_htseth(hash_table_t *ht, const char *key, size_t hash, void *value);
+void util_htrmh(hash_table_t *ht, const char *key, size_t bin, void (*cb)(void*));
+void util_htrm(hash_table_t *ht, const char *key, void (*cb)(void*));
+void *util_htget(hash_table_t *ht, const char *key);
+void *util_htgeth(hash_table_t *ht, const char *key, size_t hash);
+int util_snprintf(char *str, size_t, const char *fmt, ...);
+int util_getline(char **, size_t *, FILE *);
+
+/* code.c */
-/* TODO: cleanup */
/* Note: if you change the order, fix type_sizeof in ir.c */
-enum {
+enum qc_type {
TYPE_VOID ,
TYPE_STRING ,
TYPE_FLOAT ,
TYPE_UNION ,
TYPE_ARRAY ,
+ TYPE_NIL , /* it's its own type / untyped */
+ TYPE_NOEXPR , /* simply invalid in expressions */
+
TYPE_COUNT
};
#define CV_VAR -1
#define CV_WRONG 0x8000 /* magic number to help parsing */
-extern const char *type_name [TYPE_COUNT];
-extern uint16_t type_store_instr [TYPE_COUNT];
-extern uint16_t field_store_instr[TYPE_COUNT];
+extern const char *type_name [TYPE_COUNT];
+extern const uint16_t type_store_instr [TYPE_COUNT];
+extern const uint16_t field_store_instr[TYPE_COUNT];
/*
* could use type_store_instr + INSTR_STOREP_F - INSTR_STORE_F
* 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];
-extern uint16_t type_eq_instr [TYPE_COUNT];
-extern uint16_t type_ne_instr [TYPE_COUNT];
-extern uint16_t type_not_instr [TYPE_COUNT];
+extern const uint16_t type_storep_instr[TYPE_COUNT];
+extern const uint16_t type_eq_instr [TYPE_COUNT];
+extern const uint16_t type_ne_instr [TYPE_COUNT];
+extern const uint16_t type_not_instr [TYPE_COUNT];
-typedef struct {
+struct prog_section_t {
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;
- uint16_t skip;
-
- 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;
- prog_section globals;
- uint32_t entfield; /* Number of entity fields */
-} prog_header;
+};
+
+struct prog_header_t {
+ uint32_t version; /* Program version (6) */
+ uint16_t crc16;
+ uint16_t skip;
+
+ prog_section_t statements; /* prog_section_statement */
+ prog_section_t defs; /* prog_section_def */
+ prog_section_t fields; /* prog_section_field */
+ prog_section_t functions; /* prog_section_function */
+ prog_section_t strings;
+ prog_section_t globals;
+ uint32_t entfield; /* Number of entity fields */
+};
/*
* Each paramater incerements by 3 since vector types hold
#define OFS_PARM6 (OFS_PARM5 +3)
#define OFS_PARM7 (OFS_PARM6 +3)
-typedef struct {
- uint16_t opcode;
-
- /* operand 1 */
- union {
- int16_t s1; /* signed */
- uint16_t u1; /* unsigned */
- } o1;
- /* operand 2 */
- union {
- int16_t s1; /* signed */
- uint16_t u1; /* unsigned */
- } o2;
- /* operand 3 */
- union {
- int16_t s1; /* signed */
- uint16_t u1; /* unsigned */
- } o3;
+union operand_t {
+ int16_t s1;
+ uint16_t u1;
+};
- /*
- * This is the same as the structure in darkplaces
- * {
- * unsigned short op;
- * short a,b,c;
- * }
- * But this one is more sane to work with, and the
- * type sizes are guranteed.
- */
-} prog_section_statement;
+struct prog_section_statement_t {
+ uint16_t opcode;
+ operand_t o1;
+ operand_t o2;
+ operand_t o3;
+};
-typedef struct {
+struct prog_section_both_t {
/*
* The types:
* 0 = ev_void
uint16_t type;
uint16_t offset;
uint32_t name;
-} prog_section_both;
+};
-typedef prog_section_both prog_section_def;
-typedef prog_section_both prog_section_field;
+typedef prog_section_both_t prog_section_def_t;
+typedef prog_section_both_t prog_section_field_t;
/* this is ORed to the type */
#define DEF_SAVEGLOBAL (1<<15)
#define DEF_TYPEMASK ((1<<15)-1)
-typedef struct {
+struct prog_section_function_t {
int32_t entry; /* in statement table for instructions */
uint32_t firstlocal; /* First local in local table */
uint32_t locals; /* Total ints of params + locals */
uint32_t file; /* file of the source file */
int32_t nargs; /* number of arguments */
uint8_t argsize[8]; /* size of arguments (keep 8 always?) */
-} prog_section_function;
+};
/*
* Instructions
INSTR_BITAND,
INSTR_BITOR,
- /*
- * 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_END,
VINSTR_PHI,
VINSTR_JUMP,
VINSTR_COND,
+
/* A never returning CALL.
* Creating this causes IR blocks to be marked as 'final'.
* No-Return-Call
*/
- VINSTR_NRCALL
+ VINSTR_NRCALL,
+
+ /* Emulated instructions. */
+ VINSTR_BITAND_V, /* BITAND_V must be the first emulated bitop */
+ VINSTR_BITAND_VF,
+ VINSTR_BITOR_V,
+ VINSTR_BITOR_VF,
+ VINSTR_BITXOR,
+ VINSTR_BITXOR_V,
+ VINSTR_BITXOR_VF,
+ VINSTR_CROSS,
+ VINSTR_NEG_F,
+ VINSTR_NEG_V
};
-/* TODO: cleanup this mess */
-extern prog_section_statement *code_statements;
-extern int *code_linenums;
-extern prog_section_def *code_defs;
-extern prog_section_field *code_fields;
-extern prog_section_function *code_functions;
-extern int *code_globals;
-extern char *code_chars;
-extern uint16_t code_crc;
-
-/* uhh? */
-typedef float qcfloat;
-typedef int32_t qcint;
-
-/*
- * code_write -- writes out the compiled file
- * code_init -- prepares the code file
- */
-bool code_write (const char *filename, const char *lno);
-void code_init ();
-uint32_t code_genstring (const char *string);
-qcint code_alloc_field (size_t qcsize);
-
-/* this function is used to keep statements and linenumbers together */
-void code_push_statement(prog_section_statement *stmt, int linenum);
-void code_pop_statement();
+/* TODO: elide */
+extern const char *util_instr_str[VINSTR_END];
+
+void util_swap_header(prog_header_t &code_header);
+void util_swap_statements(std::vector<prog_section_statement_t> &statements);
+void util_swap_defs_fields(std::vector<prog_section_both_t> §ion);
+void util_swap_functions(std::vector<prog_section_function_t> &functions);
+void util_swap_globals(std::vector<int32_t> &globals);
+
+typedef float qcfloat_t;
+typedef int32_t qcint_t;
+typedef uint32_t qcuint_t;
+
+struct code_t {
+ void* operator new(std::size_t);
+ void operator delete(void*);
+ code_t();
+ ~code_t();
+ std::vector<prog_section_statement_t> statements;
+ std::vector<int> linenums;
+ std::vector<int> columnnums;
+ std::vector<prog_section_def_t> defs;
+ std::vector<prog_section_field_t> fields;
+ std::vector<prog_section_function_t> functions;
+ std::vector<int> globals;
+ std::vector<char> chars;
+ uint16_t crc = 0;
+ uint32_t entfields = 0;
+ ht string_cache;
+ qcint_t string_cached_empty = 0;
+};
/*
* A shallow copy of a lex_file to remember where which ast node
* came from.
*/
-typedef struct {
+struct lex_ctx_t {
const char *file;
- size_t line;
-} lex_ctx;
+ size_t line;
+ size_t column;
+};
-/*===================================================================*/
-/*============================ con.c ================================*/
-/*===================================================================*/
+/*
+ * code_write -- writes out the compiled file
+ * code_init -- prepares the code file
+ * code_genstrin -- generates string for code
+ * code_alloc_field -- allocated a field
+ * code_push_statement -- keeps statements and linenumbers together
+ * code_pop_statement -- keeps statements and linenumbers together
+ */
+bool code_write (code_t *, const char *filename, const char *lno);
+GMQCC_WARN
+code_t *code_init (void);
+void code_cleanup (code_t *);
+uint32_t code_genstring (code_t *, const char *string);
+qcint_t code_alloc_field (code_t *, size_t qcsize);
+void code_push_statement(code_t *, prog_section_statement_t *stmt, lex_ctx_t ctx);
+void code_pop_statement (code_t *);
+
+
+/* conout.c */
enum {
CON_BLACK = 30,
CON_RED,
LVL_ERROR
};
-FILE *con_default_out();
-FILE *con_default_err();
+FILE *con_default_out(void);
+FILE *con_default_err(void);
-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);
-void con_cprintmsg (void *ctx, int lvl, const char *msgtype, const char *msg, ...);
+void con_vprintmsg (int level, const char *name, size_t line, size_t column, const char *msgtype, const char *msg, va_list ap);
+void con_printmsg (int level, const char *name, size_t line, size_t column, const char *msgtype, const char *msg, ...);
+void con_cvprintmsg(lex_ctx_t ctx, int lvl, const char *msgtype, const char *msg, va_list ap);
+void con_cprintmsg (lex_ctx_t ctx, int lvl, const char *msgtype, const char *msg, ...);
-void con_close ();
-void con_init ();
-void con_reset ();
+void con_close (void);
+void con_init (void);
+void con_reset (void);
void con_color (int);
-int con_change(const char *, const char *);
int con_verr (const char *, va_list);
int con_vout (const char *, va_list);
int con_err (const char *, ...);
/* error/warning interface */
extern size_t compile_errors;
+extern size_t compile_Werrors;
extern size_t compile_warnings;
-void /********/ compile_error (lex_ctx ctx, /*LVL_ERROR*/ const char *msg, ...);
-void /********/ vcompile_error (lex_ctx ctx, /*LVL_ERROR*/ const char *msg, va_list ap);
-bool GMQCC_WARN compile_warning (lex_ctx ctx, int warntype, const char *fmt, ...);
-bool GMQCC_WARN vcompile_warning(lex_ctx ctx, int warntype, const char *fmt, va_list ap);
-
-/*===================================================================*/
-/*========================= assembler.c =============================*/
-/*===================================================================*/
-/* TODO: remove this ... */
-static const struct {
- const char *m; /* menomic */
- const size_t o; /* operands */
- const size_t l; /* menomic len */
-} asm_instr[] = {
- { "DONE" , 1, 4 },
- { "MUL_F" , 3, 5 },
- { "MUL_V" , 3, 5 },
- { "MUL_FV" , 3, 6 },
- { "MUL_VF" , 3, 6 },
- { "DIV" , 0, 3 },
- { "ADD_F" , 3, 5 },
- { "ADD_V" , 3, 5 },
- { "SUB_F" , 3, 5 },
- { "SUB_V" , 3, 5 },
- { "EQ_F" , 0, 4 },
- { "EQ_V" , 0, 4 },
- { "EQ_S" , 0, 4 },
- { "EQ_E" , 0, 4 },
- { "EQ_FNC" , 0, 6 },
- { "NE_F" , 0, 4 },
- { "NE_V" , 0, 4 },
- { "NE_S" , 0, 4 },
- { "NE_E" , 0, 4 },
- { "NE_FNC" , 0, 6 },
- { "LE" , 0, 2 },
- { "GE" , 0, 2 },
- { "LT" , 0, 2 },
- { "GT" , 0, 2 },
- { "FIELD_F" , 0, 7 },
- { "FIELD_V" , 0, 7 },
- { "FIELD_S" , 0, 7 },
- { "FIELD_ENT" , 0, 9 },
- { "FIELD_FLD" , 0, 9 },
- { "FIELD_FNC" , 0, 9 },
- { "ADDRESS" , 0, 7 },
- { "STORE_F" , 0, 7 },
- { "STORE_V" , 0, 7 },
- { "STORE_S" , 0, 7 },
- { "STORE_ENT" , 0, 9 },
- { "STORE_FLD" , 0, 9 },
- { "STORE_FNC" , 0, 9 },
- { "STOREP_F" , 0, 8 },
- { "STOREP_V" , 0, 8 },
- { "STOREP_S" , 0, 8 },
- { "STOREP_ENT", 0, 10},
- { "STOREP_FLD", 0, 10},
- { "STOREP_FNC", 0, 10},
- { "RETURN" , 0, 6 },
- { "NOT_F" , 0, 5 },
- { "NOT_V" , 0, 5 },
- { "NOT_S" , 0, 5 },
- { "NOT_ENT" , 0, 7 },
- { "NOT_FNC" , 0, 7 },
- { "IF" , 0, 2 },
- { "IFNOT" , 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 },
-
- { "END" , 0, 3 } /* virtual assembler instruction */
-};
-/*===================================================================*/
-/*============================= ir.c ================================*/
-/*===================================================================*/
-
-enum store_types {
+void /********/ compile_error_ (lex_ctx_t ctx, /*LVL_ERROR*/ const char *msg, ...);
+void /********/ vcompile_error (lex_ctx_t ctx, /*LVL_ERROR*/ const char *msg, va_list ap);
+bool GMQCC_WARN compile_warning_(lex_ctx_t ctx, int warntype, const char *fmt, ...);
+bool GMQCC_WARN vcompile_warning(lex_ctx_t ctx, int warntype, const char *fmt, va_list ap);
+void compile_show_werrors(void);
+
+template <typename T>
+inline constexpr const T formatNormalize(const T argument) { return argument; }
+
+inline const char *formatNormalize(const std::string &argument) {
+ return argument.c_str();
+}
+
+template<typename... Ts>
+inline bool GMQCC_WARN compile_warning(lex_ctx_t ctx, int warntype, const char *fmt, const Ts&... ts) {
+ return compile_warning_(ctx, warntype, fmt, formatNormalize(ts)...);
+}
+template<typename... Ts>
+inline void /********/ compile_error (lex_ctx_t ctx, /*LVL_ERROR*/ const char *msg, const Ts&... ts) {
+ return compile_error_(ctx, msg, formatNormalize(ts)...);
+}
+
+/* ir.c */
+/* TODO: cleanup */
+enum store_type {
store_global,
store_local, /* local, assignable for now, should get promoted later */
store_param, /* parameters, they are locals with a fixed position */
store_return /* unassignable, at OFS_RETURN */
};
-typedef struct {
- 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);
+struct vec3_t {
+ qcfloat_t x, y, z;
+};
-/*===================================================================*/
-/*============================= exec.c ==============================*/
-/*===================================================================*/
+/* exec.c */
/* TODO: cleanup */
/*
* 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];
+ qcint_t _int;
+ qcint_t string;
+ qcint_t function;
+ qcint_t edict;
+ qcfloat_t _float;
+ qcfloat_t vector[3];
+ qcint_t ivector[3];
+} qcany_t;
+
+typedef char qcfloat_t_size_is_correct [sizeof(qcfloat_t) == 4 ?1:-1];
+typedef char qcint_t_size_is_correct [sizeof(qcint_t) == 4 ?1:-1];
enum {
VMERR_OK,
VMERR_TEMPSTRING_ALLOC,
-
VMERR_END
};
#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);
+struct qc_program_t;
+typedef int (*prog_builtin_t)(qc_program_t *prog);
-typedef struct {
- qcint stmt;
- size_t localsp;
- prog_section_function *function;
-} qc_exec_stack;
-
-typedef struct qc_program_s {
- char *filename;
+struct qc_exec_stack_t {
+ qcint_t stmt;
+ size_t localsp;
+ prog_section_function_t *function;
+};
- prog_section_statement *code;
- prog_section_def *defs;
- prog_section_def *fields;
- prog_section_function *functions;
- char *strings;
- qcint *globals;
- qcint *entitydata;
- bool *entitypool;
+struct qc_program_t {
+ char *filename;
+ std::vector<prog_section_statement_t> code;
+ std::vector<prog_section_def_t> defs;
+ std::vector<prog_section_def_t> fields;
+ std::vector<prog_section_function_t> functions;
+ std::vector<char> strings;
+ std::vector<qcint_t> globals;
+ qcint_t *entitydata;
+ bool *entitypool;
- const char* *function_stack;
+ const char* *function_stack;
uint16_t crc16;
size_t tempstring_start;
size_t tempstring_at;
- qcint vmerror;
+ qcint_t vmerror;
size_t *profile;
- prog_builtin *builtins;
- size_t builtins_count;
+ prog_builtin_t *builtins;
+ size_t builtins_count;
/* size_t ip; */
- qcint entities;
+ qcint_t entities;
size_t entityfields;
bool allowworldwrites;
- qcint *localstack;
- qc_exec_stack *stack;
+ qcint_t *localstack;
+ qc_exec_stack_t *stack;
size_t statement;
size_t xflags;
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);
-
-
-/*===================================================================*/
-/*===================== parser.c commandline ========================*/
-/*===================================================================*/
-
-bool parser_init ();
-bool parser_compile_file (const char *);
-bool parser_compile_string(const char *, const char *, size_t);
-bool parser_finish (const char *);
-void parser_cleanup ();
-
-/*===================================================================*/
-/*====================== 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);
-
-/*===================================================================*/
-/*======================= main.c commandline ========================*/
-/*===================================================================*/
-
-#if 0
+
+ /* cached fields */
+ struct {
+ qcint_t frame;
+ qcint_t nextthink;
+ qcint_t think;
+ } cached_fields;
+
+ struct {
+ qcint_t self;
+ qcint_t time;
+ } cached_globals;
+
+ bool supports_state; /* is INSTR_STATE supported? */
+};
+
+qc_program_t* prog_load (const char *filename, bool ignoreversion);
+void prog_delete (qc_program_t *prog);
+bool prog_exec (qc_program_t *prog, prog_section_function_t *func, size_t flags, long maxjumps);
+const char* prog_getstring (qc_program_t *prog, qcint_t str);
+prog_section_def_t* prog_entfield (qc_program_t *prog, qcint_t off);
+prog_section_def_t* prog_getdef (qc_program_t *prog, qcint_t off);
+qcany_t* prog_getedict (qc_program_t *prog, qcint_t e);
+qcint_t prog_tempstring(qc_program_t *prog, const char *_str);
+
+
+/* parser.c */
+struct parser_t;
+parser_t *parser_create(void);
+bool parser_compile_file(parser_t *parser, const char *);
+bool parser_compile_string(parser_t *parser, const char *, const char *, size_t);
+bool parser_finish(parser_t *parser, const char *);
+void parser_cleanup(parser_t *parser);
+
+/* ftepp.c */
+struct ftepp_t;
+ftepp_t *ftepp_create (void);
+bool ftepp_preprocess_file (ftepp_t *ftepp, const char *filename);
+bool ftepp_preprocess_string(ftepp_t *ftepp, const char *name, const char *str);
+void ftepp_finish(ftepp_t *ftepp);
+const char *ftepp_get(ftepp_t *ftepp);
+void ftepp_flush(ftepp_t *ftepp);
+void ftepp_add_define(ftepp_t *ftepp, const char *source, const char *name);
+void ftepp_add_macro(ftepp_t *ftepp, const char *name, const char *value);
+
+/* main.c */
+
+#if 1
/* Helpers to allow for a whole lot of flags. Otherwise we'd limit
* to 32 or 64 -f options...
*/
-typedef struct {
+struct longbit {
size_t idx; /* index into an array of 32 bit words */
- uint8_t bit; /* index _into_ the 32 bit word, thus just uint8 */
-} longbit;
+ uint8_t bit; /* bit index for the 8 bit group idx points to */
+};
#define LONGBIT(bit) { ((bit)/32), ((bit)%32) }
+#define LONGBIT_SET(B, I) ((B).idx = (I)/32, (B).bit = ((I)%32))
#else
typedef uint32_t longbit;
#define LONGBIT(bit) (bit)
+#define LONGBIT_SET(B, I) ((B) = (I))
#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 ==============================*/
-/*===================================================================*/
-typedef struct {
+/* utf.8 */
+typedef long utf8ch_t;
+int utf8_from(char *, utf8ch_t);
+int utf8_to(utf8ch_t *, const unsigned char *, size_t);
+
+/* opts.c */
+struct opts_flag_def_t {
const char *name;
longbit bit;
-} opts_flag_def;
+};
bool opts_setflag (const char *, bool);
bool opts_setwarn (const char *, bool);
void opts_setoptimlevel(unsigned int);
void opts_ini_init (const char *);
+/* Saner flag handling */
+void opts_backup_non_Wall(void);
+void opts_restore_non_Wall(void);
+void opts_backup_non_Werror_all(void);
+void opts_restore_non_Werror_all(void);
+
+
enum {
# define GMQCC_TYPE_FLAGS
# define GMQCC_DEFINE_FLAG(X) X,
# 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 "opts.def"
- { NULL, LONGBIT(0) }
-};
enum {
# define GMQCC_TYPE_WARNS
# 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 "opts.def"
- { NULL, LONGBIT(0) }
-};
enum {
# define GMQCC_TYPE_OPTIMIZATIONS
# include "opts.def"
COUNT_OPTIMIZATIONS
};
-static const opts_flag_def opts_opt_list[] = {
-# define GMQCC_TYPE_OPTIMIZATIONS
-# define GMQCC_DEFINE_FLAG(NAME, MIN_O) { #NAME, LONGBIT(OPTIM_##NAME) },
-# include "opts.def"
- { NULL, LONGBIT(0) }
-};
-static const unsigned int opts_opt_oflag[] = {
-# define GMQCC_TYPE_OPTIMIZATIONS
-# define GMQCC_DEFINE_FLAG(NAME, MIN_O) MIN_O,
-# include "opts.def"
- 0
+
+enum {
+# define GMQCC_TYPE_OPTIONS
+# define GMQCC_DEFINE_FLAG(X) OPTION_##X,
+# include "opts.def"
+ OPTION_COUNT
};
-extern unsigned int opts_optimizationcount[COUNT_OPTIMIZATIONS];
+
+extern const opts_flag_def_t opts_flag_list[COUNT_FLAGS+1];
+extern const opts_flag_def_t opts_warn_list[COUNT_WARNINGS+1];
+extern const opts_flag_def_t opts_opt_list[COUNT_OPTIMIZATIONS+1];
+extern const unsigned int opts_opt_oflag[COUNT_OPTIMIZATIONS+1];
+extern unsigned int opts_optimizationcount[COUNT_OPTIMIZATIONS];
/* other options: */
-typedef enum {
+enum {
COMPILER_QCC, /* circa QuakeC */
COMPILER_FTEQCC, /* fteqcc QuakeC */
COMPILER_QCCX, /* qccx QuakeC */
COMPILER_GMQCC /* this QuakeC */
-} opts_std_t;
-
-/* TODO: cleanup this */
-typedef struct {
- uint32_t O; /* -Ox */
- const char *output; /* -o file */
- bool g; /* -g */
- opts_std_t standard; /* -std= */
- bool debug; /* -debug */
- bool memchk; /* -memchk */
- bool dumpfin; /* -dumpfin */
- bool dump; /* -dump */
- bool forcecrc; /* --force-crc= */
- uint16_t forced_crc; /* --force-crc= */
- bool pp_only; /* -E */
- size_t max_array_size; /* --max-array= */
-
- uint32_t flags [1 + (COUNT_FLAGS / 32)];
- uint32_t warn [1 + (COUNT_WARNINGS / 32)];
- uint32_t werror [1 + (COUNT_WARNINGS / 32)];
- uint32_t optimization[1 + (COUNT_OPTIMIZATIONS / 32)];
-} opts_cmd_t;
+};
+
+struct opt_value_t {
+ union {
+ bool b;
+ uint16_t u16;
+ uint32_t u32;
+ union {
+ char *p;
+ const char *c;
+ } str;
+ } data;
+ bool allocated;
+};
+
+struct opts_cmd_t {
+ opt_value_t options [OPTION_COUNT];
+ uint32_t flags [1 + (COUNT_FLAGS / 32)];
+ uint32_t warn [1 + (COUNT_WARNINGS / 32)];
+ uint32_t werror [1 + (COUNT_WARNINGS / 32)];
+ uint32_t warn_backup [1 + (COUNT_WARNINGS / 32)];
+ uint32_t werror_backup[1 + (COUNT_WARNINGS / 32)];
+ uint32_t optimization [1 + (COUNT_OPTIMIZATIONS / 32)];
+ bool optimizeoff; /* True when -O0 */
+};
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))))
-#define OPTS_OPTIMIZATION(i) (!! (opts.optimization[(i)/32] & (1<< ((i)%32))))
+#define OPTS_GENERIC(f,i) (!! (((f)[(i)/32]) & (1U << (unsigned)((i)%32))))
-#endif
+#define OPTS_FLAG(i) OPTS_GENERIC(opts.flags, (i))
+#define OPTS_WARN(i) OPTS_GENERIC(opts.warn, (i))
+#define OPTS_WERROR(i) OPTS_GENERIC(opts.werror, (i))
+#define OPTS_OPTIMIZATION(i) OPTS_GENERIC(opts.optimization, (i))
+
+#define OPTS_OPTION_DUPED(X) (opts.options[X].allocated)
+#define OPTS_OPTION_BOOL(X) (opts.options[X].data.b)
+#define OPTS_OPTION_U16(X) (opts.options[X].data.u16)
+#define OPTS_OPTION_U32(X) (opts.options[X].data.u32)
+#define OPTS_OPTION_STR(X) (opts.options[X].data.str.c)
+#define OPTS_OPTION_DUP(X) *(OPTS_OPTION_DUPED(X)=true, &(opts.options[X].data.str.p))
+
+#endif /*! GMQCC_HDR */