/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Dale Weiler
* Wolfgang Bumiller
*
#include <limits.h>
#include <stdlib.h>
#include <string.h>
-#include <stdio.h>
#include <stdarg.h>
+#include <stdio.h>
#include <ctype.h>
/*
* 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 : 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 \
GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
+/* Undefine the following on a release-tag: */
+#define GMQCC_VERSION_TYPE_DEVEL
+
+/* Full version string in case we need it */
+#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
+
+#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
/*
- * We cannoy rely on C99 at all, since compilers like MSVC
+ * We cannot 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
*/
#if defined(__GNUC__) || defined(__CLANG__)
# define GMQCC_WARN __attribute__((warn_unused_result))
+# define GMQCC_USED __attribute__((used))
#else
# define GMQCC_WARN
+# define GMQCC_USED
#endif
/*
* This is a hack to silent clang regarding empty
* 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
*/
-#elseif defined(_MSC_VER)
+#elif defined(_MSC_VER)
# define GMQCC_INLINE __forceinline
#else
# define GMQCC_INLINE
# define GMQCC_NORETURN
#endif
+#ifndef _MSC_VER
+# include <stdint.h>
+#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))
+#endif
+
/*
- * stdint.h and inttypes.h -less subset
- * for systems that don't have it, which we must
- * assume is all systems. (int8_t not required)
+ * Very roboust way at determining endianess at compile time: this handles
+ * almost every possible situation. Otherwise a runtime check has to be
+ * performed.
*/
-#if CHAR_MIN == -128
- typedef unsigned char uint8_t; /* same as below */
-#elif SCHAR_MIN == -128
- typedef unsigned char uint8_t; /* same as above */
+#define GMQCC_BYTE_ORDER_LITTLE 1234
+#define GMQCC_BYTE_ORDER_BIG 4321
+
+#if defined (__GNUC__) || defined (__GNU_LIBRARY__)
+# if defined (__FreeBSD__) || defined (__OpenBSD__)
+# include <sys/endian.h>
+# elif defined (BSD) && (BSD >= 199103) || defined (__DJGPP__) || defined (__CYGWIN32__)
+# 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
+# elif !defined (__MINGW32__)
+# include <endian.h>
+# if !defined (__BEOS__)
+# include <byteswap.h>
+# endif
+# endif
#endif
-#if SHRT_MAX == 0x7FFF
- typedef short int16_t;
- typedef unsigned short uint16_t;
-#elif INT_MAX == 0x7FFF
- typedef int int16_t;
- typedef unsigned int uint16_t;
+#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 (LITTLE_ENDIAN) && defined (BIG_ENDIAN)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
+# elif defined (BYTE_ORDER) && (BYTE_ORDER == LITTLE_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
+# elif defined (_LITTLE_ENDIAN) || defined (_BIG_ENDIAN)
+# if defined (_LITTLE_ENDIAN) && !defined(_BIG_ENDIAN)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
+# elif !defined (_LITTLE_ENDIAN) && defined (_BIG_ENDIAN)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
+# elif defined (_BYTE_ORDER) && (_BYTE_ORDER == _LITTLE_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
+# elif defined (__LITTLE_ENDIAN__) || defined (__BIG_ENDIAN__)
+# if defined (__LITTLE_ENDIAN__) && !defined (__BIG_ENDIAN__)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
+# elif !defined (__LITTLE_ENDIAN__) && defined (__BIG_ENDIAN__)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
+# elif defined (__BYTE_ORDER__) && (__BYTE_ORDER__ == __LITTLE_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
#endif
-#if INT_MAX == 0x7FFFFFFF
- typedef int int32_t;
- typedef unsigned int uint32_t;
-#elif LONG_MAX == 0x7FFFFFFF
- typedef long int32_t;
- typedef unsigned long uint32_t;
+#if !defined (PLATFORM_BYTE_ORDER)
+# if defined (__alpha__) || defined (__alpha) || defined (i386) || \
+ defined (__i386__) || defined (_M_I86) || defined (_M_IX86) || \
+ defined (__OS2__) || defined (sun386) || defined (__TURBOC__) || \
+ defined (vax) || defined (vms) || defined (VMS) || \
+ defined (__VMS) || defined (__x86_64__) || defined (_M_IA64) || \
+ defined (_M_X64) || defined (__i386) || defined (__x86_64)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_LITTLE
+# elif defined (AMIGA) || defined (applec) || defined (__AS400__) || \
+ defined (_CRAY) || defined (__hppa) || defined (__hp9000) || \
+ defined (ibm370) || defined (mc68000) || defined (m68k) || \
+ defined (__MRC__) || defined (__MVS__) || defined (__MWERKS__) || \
+ defined (sparc) || defined (__sparc) || defined (SYMANTEC_C) || \
+ defined (__TANDEM) || defined (THINK_C) || defined (__VMCMS__) || \
+ defined (__PPC__) || defined (__PPC) || defined (PPC)
+# define PLATFORM_BYTE_ORDER GMQCC_BYTE_ORDER_BIG
+# else
+# define PLATFORM_BYTE_ORDER -1
+# endif
#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
- /*
- * Incorrectly 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;
- typedef long intptr_t;
-#else
- typedef unsigned int uintptr_t;
- typedef int intptr_t;
-#endif
-/* Ensure type sizes are correct: */
-typedef char uint8_size_is_correct [sizeof(uint8_t) == 1?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];
-typedef char int32_size_is_correct [sizeof(int32_t) == 4?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];
/*===================================================================*/
/*=========================== 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 *);
+void *util_memory_a (size_t, /*****/ unsigned int, const char *);
+void *util_memory_r (void *, size_t, unsigned int, const char *);
+void util_memory_d (void *);
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 *, int, int);
+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);
+
+void util_seed(uint32_t);
+uint32_t util_rand();
+
+int util_vasprintf(char **ret, const char *fmt, va_list);
+int util_asprintf (char **ret, const char *fmt, ...);
+
#ifdef NOTRACK
# define mem_a(x) malloc (x)
-# define mem_d(x) free (x)
-# define mem_r(x, n) realloc(x, n)
+# 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((x), __LINE__, __FILE__)
-# define mem_r(x, n) util_memory_r((x), (n), __LINE__, __FILE__)
+# define mem_d(x) util_memory_d((void*)(x))
+# define mem_r(x, n) util_memory_r((void*)(x), (n), __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))
-
-/* 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))
+#define vec_meta(A) (((vector_t*)(A)) - 1)
+#define vec_free(A) ((void)((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) ((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_upload(X,Y,S) ((void)(memcpy(vec_add((X), (S) * sizeof(*(Y))), (Y), (S) * sizeof(*(Y)))))
+#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 trie_s {
+ void *value;
+ struct trie_s *entries;
+} correct_trie_t;
+
+correct_trie_t* correct_trie_new();
typedef struct hash_table_t {
size_t size;
struct hash_node_t **table;
} hash_table_t, *ht;
+typedef struct hash_set_t {
+ size_t bits;
+ size_t mask;
+ size_t capacity;
+ size_t *items;
+ size_t total;
+} hash_set_t, *hs;
+
/*
* hashtable implementation:
*
*/
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);
+
+/*
+ * hashset implementation:
+ * 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_hsnew() -- to make a new hashset
+ * util_hsadd(set, key) -- to add something in the set
+ * util_hshas(set, key) -- to check if something is in the set
+ * util_hsrem(set, key) -- to remove something in the set
+ * util_hsdel(set) -- to delete the set
+ *
+ * example of use:
+ *
+ * hs foo = util_hsnew();
+ * char *bar = "hello blub\n";
+ * char *baz = "hello dale\n";
+ *
+ * util_hsadd(foo, bar);
+ * util_hsadd(foo, baz);
+ * util_hsrem(foo, baz);
+ *
+ * printf("bar %d | baz %d\n",
+ * util_hshas(foo, bar),
+ * util_hshad(foo, baz)
+ * );
+ *
+ * util_hsdel(foo);
+ */
+
+hash_set_t *util_hsnew(void);
+int util_hsadd(hash_set_t *, void *);
+int util_hshas(hash_set_t *, void *);
+int util_hsrem(hash_set_t *, void *);
+void util_hsdel(hash_set_t *);
+
+/*===================================================================*/
+/*============================ 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_putc (FILE *, int);
+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 *);
+
+
+/*===================================================================*/
+/*=========================== correct.c =============================*/
+/*===================================================================*/
+typedef struct {
+ char ***edits;
+} correction_t;
+
+void correct_del (correct_trie_t*, size_t **);
+void correct_add (correct_trie_t*, size_t ***, const char *);
+char *correct_str (correction_t *, correct_trie_t*, const char *);
+void correct_init(correction_t *);
+void correct_free(correction_t *);
+
/*===================================================================*/
/*=========================== code.c ================================*/
/*===================================================================*/
+/* TODO: cleanup */
/* Note: if you change the order, fix type_sizeof in ir.c */
enum {
TYPE_VOID ,
TYPE_UNION ,
TYPE_ARRAY ,
+ TYPE_NIL , /* it's its own type / untyped */
+ TYPE_NOEXPR , /* simply invalid in expressions */
+
TYPE_COUNT
};
/* const/var qualifiers */
-#define CV_NONE 0
-#define CV_CONST 1
-#define CV_VAR -1
+#define CV_NONE 0
+#define CV_CONST 1
+#define CV_VAR -1
+#define CV_WRONG 0x8000 /* magic number to help parsing */
-extern const char *type_name[TYPE_COUNT];
+extern const char *type_name [TYPE_COUNT];
+extern uint16_t type_store_instr [TYPE_COUNT];
+extern uint16_t field_store_instr[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
+/*
+ * 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];
-extern uint16_t type_not_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];
typedef struct {
uint32_t offset; /* Offset in file of where data begins */
typedef struct {
uint32_t version; /* Program version (6) */
- uint16_t crc16; /* What is this? */
- uint16_t skip; /* see propsal.txt */
+ 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; /* What is this? */
- prog_section globals; /* What is this? */
+ prog_section strings;
+ prog_section globals;
uint32_t entfield; /* Number of entity fields */
} prog_header;
} prog_section_statement;
typedef struct {
- /* The types:
+ /*
+ * The types:
* 0 = ev_void
* 1 = ev_string
* 2 = ev_float
uint16_t offset;
uint32_t name;
} prog_section_both;
+
typedef prog_section_both prog_section_def;
typedef prog_section_both prog_section_field;
uint32_t profile; /* Always zero (engine uses this) */
uint32_t name; /* name of function in string table */
uint32_t file; /* file of the source file */
- uint32_t nargs; /* number of arguments */
+ int32_t nargs; /* number of arguments */
uint8_t argsize[8]; /* size of arguments (keep 8 always?) */
} prog_section_function;
*/
VINSTR_PHI,
VINSTR_JUMP,
- VINSTR_COND
+ VINSTR_COND,
+ /* A never returning CALL.
+ * Creating this causes IR blocks to be marked as 'final'.
+ * No-Return-Call
+ */
+ VINSTR_NRCALL
};
+/* 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 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);
+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 */
+void code_push_statement(prog_section_statement *stmt, int linenum);
+void code_pop_statement();
+
/*
* A shallow copy of a lex_file to remember where which ast node
* came from.
size_t line;
} lex_ctx;
-
/*===================================================================*/
/*============================ con.c ================================*/
/*===================================================================*/
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);
void con_cprintmsg (void *ctx, int lvl, const char *msgtype, const char *msg, ...);
-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, ...);
+void con_close ();
+void con_init ();
+void con_reset ();
+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 *, ...);
+int con_out (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, const char *msg, ...);
-bool GMQCC_WARN compile_warning(lex_ctx ctx, int warntype, const char *fmt, ...);
+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);
+void compile_show_werrors();
/*===================================================================*/
/*========================= assembler.c =============================*/
/*===================================================================*/
+/* TODO: remove this ... */
static const struct {
const char *m; /* menomic */
const size_t o; /* operands */
/*============================= exec.c ==============================*/
/*===================================================================*/
-/* darkplaces has (or will have) a 64 bit prog loader
+/* TODO: cleanup */
+/*
+ * 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.
int argc; /* current arg count for debugging */
} qc_program;
-qc_program* prog_load(const char *filename);
+qc_program* prog_load(const char *filename, bool ignoreversion);
void prog_delete(qc_program *prog);
bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps);
/*===================================================================*/
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);
+struct lex_file_s;
+typedef struct {
+ const char *name;
+ char *(*func)(struct lex_file_s *);
+} ftepp_predef_t;
+
+/*
+ * line, file, counter, counter_last, random, random_last, date, time
+ * increment when items are added
+ */
+#define FTEPP_PREDEF_COUNT 8
+
+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);
+
+extern const ftepp_predef_t ftepp_predefs[FTEPP_PREDEF_COUNT];
/*===================================================================*/
/*======================= main.c commandline ========================*/
/*===================================================================*/
-#if 0
+#if 1
/* 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 */
+ uint8_t bit; /* bit index for the 8 bit group idx points to */
} longbit;
#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
-/* Used to store the list of flags with names */
+/*===================================================================*/
+/*=========================== 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 {
const char *name;
- longbit bit;
+ longbit bit;
+ const char *description;
} opts_flag_def;
-/*===================================================================*/
-/* list of -f flags, like -fdarkplaces-string-table-bug */
+bool opts_setflag (const char *, bool);
+bool opts_setwarn (const char *, bool);
+bool opts_setwerror(const char *, bool);
+bool opts_setoptim (const char *, bool);
+
+void opts_init (const char *, int, size_t);
+void opts_set (uint32_t *, size_t, bool);
+void opts_setoptimlevel(unsigned int);
+void opts_ini_init (const char *);
+
+/* Saner flag handling */
+void opts_backup_non_Wall();
+void opts_restore_non_Wall();
+void opts_backup_non_Werror_all();
+void opts_restore_non_Werror_all();
+
enum {
# define GMQCC_TYPE_FLAGS
-# define GMQCC_DEFINE_FLAG(X) X,
+# define GMQCC_DEFINE_FLAG(X, Y) 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) },
+# define GMQCC_DEFINE_FLAG(X, Y) { #X, LONGBIT(X), Y},
# include "opts.def"
- { NULL, LONGBIT(0) }
+ { NULL, LONGBIT(0), "" }
};
enum {
# define GMQCC_TYPE_WARNS
-# define GMQCC_DEFINE_FLAG(X) WARN_##X,
+# define GMQCC_DEFINE_FLAG(X, Y) WARN_##X,
# 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) },
+# define GMQCC_DEFINE_FLAG(X, Y) { #X, LONGBIT(WARN_##X), Y },
# include "opts.def"
- { NULL, LONGBIT(0) }
+ { NULL, LONGBIT(0), "" }
};
enum {
# define GMQCC_TYPE_OPTIMIZATIONS
-# define GMQCC_DEFINE_FLAG(NAME, MIN_O) OPTIM_##NAME,
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O, Y) OPTIM_##NAME,
# 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) },
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O, Y) { #NAME, LONGBIT(OPTIM_##NAME), Y},
# include "opts.def"
- { NULL, LONGBIT(0) }
+ { NULL, LONGBIT(0), "" }
};
static const unsigned int opts_opt_oflag[] = {
# define GMQCC_TYPE_OPTIMIZATIONS
-# define GMQCC_DEFINE_FLAG(NAME, MIN_O) MIN_O,
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O, Y) MIN_O,
# include "opts.def"
0
};
-extern unsigned int optimization_count[COUNT_OPTIMIZATIONS];
-/* other options: */
enum {
+# define GMQCC_TYPE_OPTIONS
+# define GMQCC_DEFINE_FLAG(X, Y) OPTION_##X,
+# include "opts.def"
+ OPTION_COUNT
+};
+
+
+GMQCC_USED static const char *opts_options_descriptions[] = {
+# define GMQCC_TYPE_OPTIONS
+# define GMQCC_DEFINE_FLAG(X, Y) Y,
+# include "opts.def"
+ "<null>"
+};
+
+
+extern unsigned int opts_optimizationcount[COUNT_OPTIMIZATIONS];
+
+/* other options: */
+typedef 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;
-extern bool opts_dumpfin;
-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;
+} opts_std_t;
-/*===================================================================*/
-#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)];
-#define OPTS_OPTIMIZATION(i) (!! (opts_optimization[(i)/32] & (1<< ((i)%32))))
-extern uint32_t opts_optimization[1 + (COUNT_OPTIMIZATIONS / 32)];
+typedef enum {
+ OPT_TYPE_BOOL,
+ OPT_TYPE_U16,
+ OPT_TYPE_U32,
+ OPT_TYPE_STR
+} opt_type_t;
+
+typedef union {
+ bool B;
+ uint16_t U16;
+ uint32_t U32;
+ char *STR;
+} opt_value_t;
+
+
+typedef struct {
+ 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)];
+} opts_cmd_t;
+
+extern opts_cmd_t opts;
+
+#define OPTS_GENERIC(f,i) (!! (((f)[(i)/32]) & (1<< ((i)%32))))
+#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_BOOL(X) (opts.options[X].B)
+#define OPTS_OPTION_U16(X) (opts.options[X].U16)
+#define OPTS_OPTION_U32(X) (opts.options[X].U32)
+#define OPTS_OPTION_STR(X) (opts.options[X].STR)
#endif