From 63b6abb46368f1f4757926a1bfbe8eb6770c2619 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Thu, 26 Apr 2012 11:37:47 -0400 Subject: [PATCH 1/3] GMQCC_VERSION --- gmqcc.h | 7 +++++++ main.c | 64 +++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 24 deletions(-) diff --git a/gmqcc.h b/gmqcc.h index d40314f..5b2b7bb 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -28,6 +28,13 @@ #include #include +#define GMQCC_VERSION_MAJOR 0 +#define GMQCC_VERSION_MINOR 1 +#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 diff --git a/main.c b/main.c index 89090ba..006fdea 100644 --- a/main.c +++ b/main.c @@ -33,25 +33,27 @@ bool opts_omit_nullcode = false; int opts_compiler = COMPILER_GMQCC; static const int usage(const char *const app) { - printf("usage:\n"); - printf(" %s -c -oprog.dat -- compile file\n" , app); - printf(" %s -a -oprog.dat -- assemble file\n" , app); - printf(" %s -c -i -oprog.dat -- compile together (allowed multiple -i)\n" , app); - printf(" %s -a -i -oprog.dat -- assemble together(allowed multiple -i)\n", app); - printf(" example:\n"); - printf(" %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n", app); - printf(" additional flags:\n"); - printf(" -debug -- turns on compiler debug messages\n"); - printf(" -memchk -- turns on compiler memory leak check\n"); - printf(" -help -- prints this help/usage text\n"); - printf(" -std -- select the QuakeC compile type (types below):\n"); - printf(" -std=qcc -- original QuakeC\n"); - printf(" -std=ftqecc -- fteqcc QuakeC\n"); - printf(" -std=qccx -- qccx QuakeC\n"); - printf(" -std=gmqcc -- this compiler QuakeC (default selection)\n"); - printf(" codegen flags:\n"); - printf(" -fdarkplaces-string-table-bug -- patches the string table to work with bugged versions of darkplaces\n"); - printf(" -fomit-nullcode -- omits the generation of null code (will break everywhere see propsal.txt)\n"); + printf("usage:\n" + " %s -c -oprog.dat -- compile file\n" + " %s -a -oprog.dat -- assemble file\n" + " %s -c -i -oprog.dat -- compile together (allowed multiple -i)\n" + " %s -a -i -oprog.dat -- assemble together(allowed multiple -i)\n" + " example:\n" + " %s -cfoo.qc -ibar.qc -oqc.dat -afoo.qs -ibar.qs -oqs.dat\n" + " additional flags:\n" + " -debug -- turns on compiler debug messages\n" + " -memchk -- turns on compiler memory leak check\n" + " -help -- prints this help/usage text\n" + " -std -- select the QuakeC compile type (types below):\n" + " -std=qcc -- original QuakeC\n" + " -std=ftqecc -- fteqcc QuakeC\n" + " -std=qccx -- qccx QuakeC\n" + " -std=gmqcc -- this compiler QuakeC (default selection)\n" + " codegen flags:\n" + " -fdarkplaces-string-table-bug -- patches the string table to work with bugged versions of darkplaces\n" + " -fomit-nullcode -- omits the generation of null code (will break everywhere see propsal.txt)\n", + app,app,app,app,app + ); return -1; } @@ -69,6 +71,20 @@ int main(int argc, char **argv) { while ((argc > 1) && argv[1][0] == '-') { switch (argv[1][1]) { + case 'v': { + printf("GMQCC:\n" + " version: %d.%d.%d (0x%08X)\n" + " build date: %s\n" + " build time: %s\n", + (GMQCC_VERSION >> 16) & 0xFF, + (GMQCC_VERSION >> 8) & 0xFF, + (GMQCC_VERSION >> 0) & 0xFF, + (GMQCC_VERSION), + __DATE__, + __TIME__ + ); + return 0; + } case 'c': items_add((argitem){util_strdup(&argv[1][2]), 0}); break; /* compile */ case 'a': items_add((argitem){util_strdup(&argv[1][2]), 1}); break; /* assemble */ case 'i': items_add((argitem){util_strdup(&argv[1][2]), 2}); break; /* includes */ @@ -85,11 +101,11 @@ int main(int argc, char **argv) { if (!strncmp(&argv[1][1], "std=qccx", 8 )) { opts_compiler = COMPILER_QCCX; break; } if (!strncmp(&argv[1][1], "std=gmqcc", 9 )) { opts_compiler = COMPILER_GMQCC; break; } if (!strncmp(&argv[1][1], "std=", 4 )) { - printf("invalid std selection, supported types:\n"); - printf(" -std=qcc -- original QuakeC\n"); - printf(" -std=ftqecc -- fteqcc QuakeC\n"); - printf(" -std=qccx -- qccx QuakeC\n"); - printf(" -std=gmqcc -- this compiler QuakeC (default selection)\n"); + printf("invalid std selection, supported types:\n" + " -std=qcc -- original QuakeC\n" + " -std=ftqecc -- fteqcc QuakeC\n" + " -std=qccx -- qccx QuakeC\n" + " -std=gmqcc -- this compiler QuakeC (default selection)\n"); return 0; } From dd66080aaf97373071e076bb0d66d6ea7b04d73f Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Thu, 26 Apr 2012 23:20:35 -0400 Subject: [PATCH 2/3] removed clutter --- util.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/util.c b/util.c index 63d4e6f..02e4e6c 100644 --- a/util.c +++ b/util.c @@ -335,21 +335,3 @@ int util_getline(char **lineptr, size_t *n, FILE *stream) { *pos = '\0'; return (ret = pos - *lineptr); } - -/* - * Strechy string buffer (for easy string creation) -- this is fast, just - * say no to strict aliasing. - */ -//#define util_stringbuf_add(a,v) ((((a)==0 ||((int*)(a)-2)[1]+(1)>=((int*)(a)-2)[0])?util_stringbuf_grow((void**)&(a),(1),sizeof(*(a))):0),(a)[((int*)(a)-2)[1]++]=(v)) -//#define util_stringbuf_len(a) ((a)? ((int*)(a)-2)[1]:0) -//#define util_stringbuf_del(a) ((a)?free (((int*)(a)-2)),0:0) -void *util_stringbuf_grow(void **a, int in, int it) { - int m = *a ? 2 * ((int*)(*a)-2)[0]+in : in+1; - void *p = realloc(*a ? ((int*)(*a)-2) : 0, it * m + sizeof(int)*2); - if (p) { - if (!*a) ((int*)p)[1] = 0; - *a = (void*)((int*)p+2); - ((int*)(*a)-2)[0] = m; - } - return *a; -} From db879bd626af0003840ee32df41cf17714680ac8 Mon Sep 17 00:00:00 2001 From: Dale Weiler Date: Thu, 26 Apr 2012 23:23:31 -0400 Subject: [PATCH 3/3] Now compiles with mingw; added makefile for windows. --- Makefile_win | 19 +++++++++++++++++++ gmqcc.h | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 Makefile_win diff --git a/Makefile_win b/Makefile_win new file mode 100644 index 0000000..dccce07 --- /dev/null +++ b/Makefile_win @@ -0,0 +1,19 @@ +CC = i486-mingw32-gcc +CFLAGS += -Wall +OBJ = main.o \ + lex.o \ + error.o \ + parse.o \ + typedef.o \ + util.o \ + code.o \ + asm.c + +%.o: %.c + $(CC) -c $< -o $@ $(CFLAGS) + +gmqcc: $(OBJ) + $(CC) -o $@ $^ $(CFLAGS) + +clean: + rm -f *.o gmqcc diff --git a/gmqcc.h b/gmqcc.h index 5b2b7bb..7eb8359 100644 --- a/gmqcc.h +++ b/gmqcc.h @@ -93,7 +93,7 @@ typedef char uint8_size_is_correct [sizeof(uint8_t) == 1?1:-1]; typedef char uint16_size_if_correct [sizeof(uint16_t) == 2?1:-1]; typedef char uint32_size_is_correct [sizeof(uint32_t) == 4?1:-1]; -typedef char int8_size_is_correct [sizeof(int8_t) == 1?1:-1]; +//typedef char int8_size_is_correct [sizeof(int8_t) == 1?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]; /* intptr_t / uintptr_t correct size check */