*/
#ifndef GMQCC_HDR
#define GMQCC_HDR
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
#include <stdarg.h>
-#include <stdio.h>
-#include <ctype.h>
+#include <stdio.h> /* TODO: remove this */
/*
* Disable some over protective warnings in visual studio because fixing them is a waste
*/
#ifdef _MSC_VER
# pragma warning(disable : 4244 ) /* conversion from 'int' to 'float', possible loss of data */
-# pragma warning(disable : 4018 ) /* signed/unsigned mismatch */
-#endif
+#endif /*! _MSC_VER */
#define GMQCC_VERSION_MAJOR 0
#define GMQCC_VERSION_MINOR 3
#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"
+#ifdef GMQCC_VERSION_TYPE_DEVEL
+# 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_DEV_VERSION_STRING
#endif
#ifndef __cplusplus
# ifdef false
# undef false
-# endif /* !false */
+# endif /*! false */
# ifdef true
# undef true
-# endif /* !true */
+# endif /*! true */
# define false (0)
# define true (1)
# ifdef __STDC_VERSION__
typedef int bool;
# else
typedef _Bool bool;
-# endif
+# endif /*! __STDC_VERSION__ < 199901L && __GNUC__ < 3 */
# else
typedef int bool;
-# endif /* !__STDC_VERSION__ */
-#endif /* !__cplusplus */
+# endif /*! __STDC_VERSION__ */
+#endif /*! __cplusplus */
/*
* Of some functions which are generated we want to make sure
#else
# define GMQCC_WARN
# define GMQCC_USED
-#endif
+#endif /*! defined(__GNUC__) || defined (__CLANG__) */
/*
* This is a hack to silent clang regarding empty
* body if statements.
# define GMQCC_INLINE
# else
# define GMQCC_INLINE __attribute__ ((always_inline))
-# endif
+# endif /*! __GNUC__ < 2 */
# else
# define GMQCC_INLINE
-# endif
+# endif /*! defined(__GNUC__) || defined (__CLANG__) */
# else
# define GMQCC_INLINE inline
-# endif
+# endif /*! __STDC_VERSION < 199901L */
/*
* Visual studio has __forcinline we can use. So lets use that
* I suspect it also has just __inline of some sort, but our use
# define GMQCC_INLINE __forceinline
#else
# define GMQCC_INLINE
-#endif /* !__STDC_VERSION__ */
+#endif /*! __STDC_VERSION__ */
/*
* noreturn is present in GCC and clang
# define GMQCC_NORETURN __attribute__ ((noreturn))
#else
# define GMQCC_NORETURN
-#endif
+#endif /*! (defined(__GNUC__) && __GNUC__ >= 2) || defined (__CLANG__) */
#ifndef _MSC_VER
# include <stdint.h>
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
+#endif /*! _MSC_VER */
/*
* Very roboust way at determining endianess at compile time: this handles
# 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) || \
# else
# define PLATFORM_BYTE_ORDER -1
# endif
-#endif
+#endif /*! !defined (PLATFORM_BYTE_ORDER) */
+/*
+ * On windows systems where we're not compiling with MING32 we need a
+ * little extra help on dependinces for implementing our own dirent.h
+ * in fs.c.
+ */
+#if defined(_WIN32) && !defined(__MINGW32__)
+# define _WIN32_LEAN_AND_MEAN
+# include <windows.h>
+# include <io.h>
+# include <fcntl.h>
+
+ struct dirent {
+ long d_ino;
+ unsigned short d_reclen;
+ unsigned short d_namlen;
+ char d_name[FILENAME_MAX];
+ };
+
+ typedef struct {
+ struct _finddata_t dd_dta;
+ struct dirent dd_dir;
+ long dd_handle;
+ int dd_stat;
+ char dd_name[1];
+ } DIR;
+ /*
+ * Visual studio also lacks S_ISDIR for sys/stat.h, so we emulate this as well
+ * which is not hard at all.
+ */
+# ifdef S_ISDIR
+# undef S_ISDIR
+# endif /*! S_ISDIR */
+# define S_ISDIR(X) ((X)&_S_IFDIR)
+#else
+# include <dirent.h>
+#endif /*! _WIN32 && !defined(__MINGW32__) */
+
+/*===================================================================*/
+/*=========================== stat.c ================================*/
+/*===================================================================*/
+void stat_info (void);
+char *stat_mem_strdup (const char *, size_t, const char *, bool);
+void *stat_mem_reallocate(void *, size_t, size_t, const char *);
+void stat_mem_deallocate(void *);
+void *stat_mem_allocate (size_t, size_t, const char *);
+
+#define mem_a(SIZE) stat_mem_allocate ((SIZE), __LINE__, __FILE__)
+#define mem_d(PTRN) stat_mem_deallocate((void*)(PTRN))
+#define mem_r(PTRN, SIZE) stat_mem_reallocate((void*)(PTRN), (SIZE), __LINE__, __FILE__)
+#define mem_af(SIZE, FILE, LINE) stat_mem_allocate ((SIZE), (LINE), (FILE))
+/* TODO: rename to mem variations */
+#define util_strdup(SRC) stat_mem_strdup((char*)(SRC), __LINE__, __FILE__, false)
+#define util_strdupe(SRC) stat_mem_strdup((char*)(SRC), __LINE__, __FILE__, true)
/*===================================================================*/
/*=========================== util.c ================================*/
/*===================================================================*/
-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 ();
+
+/*
+ * Microsoft implements against the spec versions of ctype.h. Which
+ * means what ever the current set locale is will render the actual
+ * results of say isalpha('A') wrong for what ever retarded locale
+ * is used. Simalerly these are also implemented inefficently on
+ * some toolchains and end up becoming actual library calls. Perhaps
+ * this is why tools like yacc provide their own? Regardless implementing
+ * these as functions is equally as silly, the call overhead is not
+ * justified when this could happen on every character from an input
+ * stream. We provide our own as macros for absolute inlinability.
+ */
+#define util_isupper(C) ((C) >= 'A' && (C) <= 'Z')
+#define util_islower(C) ((C) >= 'a' && (C) <= 'z')
+#define util_isdigit(C) ((C) >= '0' && (C) <= '9')
+#define util_isprint(C) ((C) >= 32 && (C) <= 126)
+#define util_isspace(C) ((C) == ' ' || (C) == '\f' || \
+ (C) == '\n'|| (C) == '\r' || \
+ (C) == '\t'|| (C) == '\v')
+
+#define util_isalpha(C) (util_islower(C) || util_isupper(C))
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);
uint16_t util_crc16(uint16_t crc, const char *data, size_t len);
void util_seed(uint32_t);
-uint32_t util_rand();
+uint32_t util_rand(void);
-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 ((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))
-# define mem_r(x, n) util_memory_r((void*)(x), (n), __LINE__, __FILE__)
-#endif
+/*
+ * String functions (formatting, copying, concatenating, errors). These are wrapped
+ * to use the MSVC _safe_ versions when using MSVC, plus some implementations of
+ * these are non-conformant or don't exist such as asprintf and snprintf, which are
+ * not supported in C90, but do exist in C99.
+ */
+int util_vasprintf(char **ret, const char *fmt, va_list);
+int util_asprintf (char **ret, const char *fmt, ...);
+int util_snprintf (char *src, size_t bytes, const char *format, ...);
+char *util_strcat (char *dest, const char *src);
+char *util_strncpy (char *dest, const char *src, size_t num);
+const char *util_strerror (int num);
/*
* 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 {
size_t allocated;
size_t used;
)
/* exposed interface */
-#define vec_meta(A) (((vector_t*)(A)) - 1)
+#define vec_meta(A) (((vector_t*)((void*)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)
struct trie_s *entries;
} correct_trie_t;
-correct_trie_t* correct_trie_new();
+correct_trie_t* correct_trie_new(void);
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:
*
* util_htdel(foo);
*/
hash_table_t *util_htnew (size_t size);
+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);
-/*
- * 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);
+/* file handling */
+void fs_file_close (FILE *);
+int fs_file_error (FILE *);
+int fs_file_getc (FILE *);
+int fs_file_printf (FILE *, const char *, ...);
+int fs_file_puts (FILE *, const char *);
+int fs_file_seek (FILE *, long int, int);
+long int fs_file_tell (FILE *);
+
+size_t fs_file_read (void *, size_t, size_t, FILE *);
+size_t fs_file_write (const void *, size_t, size_t, FILE *);
-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 *);
+FILE *fs_file_open (const char *, const char *);
+int fs_file_getline(char **, size_t *, FILE *);
-GMQCC_INLINE FILE *file_open (const char *, const char *);
-/*NOINLINE*/ int file_getline(char **, size_t *, FILE *);
+/* directory handling */
+int fs_dir_make (const char *);
+DIR *fs_dir_open (const char *);
+int fs_dir_close (DIR *);
+struct dirent *fs_dir_read (DIR *);
/*===================================================================*/
/*=========================== correct.c =============================*/
/*===================================================================*/
typedef struct {
- char ***edits;
+ char ***edits;
+ size_t **lens;
} correction_t;
void correct_del (correct_trie_t*, size_t **);
#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 {
uint32_t offset; /* Offset in file of where data begins */
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 int *code_globals;
-extern char *code_chars;
-extern uint16_t code_crc;
-
/* uhh? */
typedef float qcfloat;
typedef int32_t qcint;
+typedef struct {
+ prog_section_statement *statements;
+ int *linenums;
+ prog_section_def *defs;
+ prog_section_field *fields;
+ prog_section_function *functions;
+ int *globals;
+ char *chars;
+ uint16_t crc;
+ uint32_t entfields;
+ ht string_cache;
+ qcint string_cached_empty;
+} code_t;
+
/*
- * code_write -- writes out the compiled file
- * code_init -- prepares the code file
+ * 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 (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();
+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 code_alloc_field (code_t *, size_t qcsize);
+void code_push_statement(code_t *, prog_section_statement *stmt, int linenum);
+void code_pop_statement (code_t *);
/*
* A shallow copy of a lex_file to remember where which ast node
typedef struct {
const char *file;
size_t line;
+ size_t column;
} lex_ctx;
/*===================================================================*/
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_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(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_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);
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();
+void compile_show_werrors(void);
/*===================================================================*/
/*========================= assembler.c =============================*/
bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps);
-char* prog_getstring (qc_program *prog, qcint str);
+const 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);
/*===================================================================*/
/*===================== 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 ();
+struct parser_s;
+struct parser_s *parser_create (void);
+bool parser_compile_file (struct parser_s *parser, const char *);
+bool parser_compile_string(struct parser_s *parser, const char *, const char *, size_t);
+bool parser_finish (struct parser_s *parser, const char *);
+void parser_cleanup (struct parser_s *parser);
/*===================================================================*/
/*====================== ftepp.c commandline ========================*/
/*===================================================================*/
-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];
+struct ftepp_s;
+struct ftepp_s *ftepp_create (void);
+bool ftepp_preprocess_file (struct ftepp_s *ftepp, const char *filename);
+bool ftepp_preprocess_string(struct ftepp_s *ftepp, const char *name, const char *str);
+void ftepp_finish (struct ftepp_s *ftepp);
+const char *ftepp_get (struct ftepp_s *ftepp);
+void ftepp_flush (struct ftepp_s *ftepp);
+void ftepp_add_define (struct ftepp_s *ftepp, const char *source, const char *name);
+void ftepp_add_macro (struct ftepp_s *ftepp, const char *name, const char *value);
/*===================================================================*/
/*======================= main.c commandline ========================*/
typedef struct {
const char *name;
longbit bit;
- const char *description;
} opts_flag_def;
bool opts_setflag (const char *, bool);
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();
+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, Y) X,
+# 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, Y) { #X, LONGBIT(X), Y},
+# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(X) },
# include "opts.def"
- { NULL, LONGBIT(0), "" }
+ { NULL, LONGBIT(0) }
};
enum {
# define GMQCC_TYPE_WARNS
-# define GMQCC_DEFINE_FLAG(X, Y) WARN_##X,
+# define GMQCC_DEFINE_FLAG(X) WARN_##X,
# include "opts.def"
COUNT_WARNINGS
};
static const opts_flag_def opts_warn_list[] = {
# define GMQCC_TYPE_WARNS
-# define GMQCC_DEFINE_FLAG(X, Y) { #X, LONGBIT(WARN_##X), Y },
+# define GMQCC_DEFINE_FLAG(X) { #X, LONGBIT(WARN_##X) },
# include "opts.def"
- { NULL, LONGBIT(0), "" }
+ { NULL, LONGBIT(0) }
};
enum {
# define GMQCC_TYPE_OPTIMIZATIONS
-# define GMQCC_DEFINE_FLAG(NAME, MIN_O, Y) OPTIM_##NAME,
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O) 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, Y) { #NAME, LONGBIT(OPTIM_##NAME), Y},
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O) { #NAME, LONGBIT(OPTIM_##NAME) },
# 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, Y) MIN_O,
+# define GMQCC_DEFINE_FLAG(NAME, MIN_O) MIN_O,
# include "opts.def"
0
};
enum {
# define GMQCC_TYPE_OPTIONS
-# define GMQCC_DEFINE_FLAG(X, Y) OPTION_##X,
+# define GMQCC_DEFINE_FLAG(X) 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"
- ""
-};
-
extern unsigned int opts_optimizationcount[COUNT_OPTIMIZATIONS];
/* other options: */
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 */
} opts_cmd_t;
extern opts_cmd_t opts;
-#define OPTS_GENERIC(f,i) (!! (((f)[(i)/32]) & (1<< ((i)%32))))
+#define OPTS_GENERIC(f,i) (!! (((f)[(i)/32]) & (1<< (unsigned)((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_OPTION_U32(X) (opts.options[X].U32)
#define OPTS_OPTION_STR(X) (opts.options[X].STR)
-#endif
+#endif /*! GMQCC_HDR */
projects / xonotic / gmqcc.git / blobdiff