X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=main.c;h=c2e7a8d6cc842fa3af86aa51d62de288ffeb2a14;hb=e35a26a9e18ebbc93e209e3d4b1654965ccda810;hp=b9a23dfc5d755e3f117804c9dd8b2f6e136ae7f0;hpb=5e026dd62af204d827fcda537b6c70629c3c266b;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index b9a23df..c2e7a8d 100644 --- a/main.c +++ b/main.c @@ -22,11 +22,14 @@ */ #include "gmqcc.h" -uint32_t opt_flags[1 + (NUM_F_FLAGS / 32)]; +uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; +uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)]; -uint32_t opt_O = 1; -const char *opt_output = "progs.dat"; -int opt_standard = STD_DEF; +uint32_t opts_O = 1; +const char *opts_output = "progs.dat"; +int opts_standard = COMPILER_GMQCC; +bool opts_debug = false; +bool opts_memchk = false; typedef struct { char *filename; int type; } argitem; VECTOR_MAKE(argitem, items); @@ -41,15 +44,20 @@ static int usage() { printf("usage: %s [options] [files...]", app_name); printf("options:\n" " -h, --help show this help message\n" - " -o, --output=file output file, defaults to progs.dat\n" + " -debug turns on compiler debug messages\n" + " -memchk turns on compiler memory leak check\n"); + printf(" -o, --output=file output file, defaults to progs.dat\n" " -a filename add an asm file to be assembled\n" " -s filename add a progs.src file to be used\n"); - printf(" -fflag enable a flag\n" - " -fno-flag disable a flag\n" + printf(" -f enable a flag\n" + " -fno- disable a flag\n" " -std standard select one of the following standards\n" " -std=qcc original QuakeC\n" " -std=fteqcc fteqcc QuakeC\n" " -std=gmqcc this compiler (default)\n"); + printf(" -W enable a warning\n" + " -Wno- disable a warning\n" + " -Wall enable all warnings\n"); printf("\n"); printf("flags:\n" " -fdarkplaces-string-table-bug\n" @@ -60,28 +68,34 @@ static int usage() { return -1; } -static bool options_setflag(const char *name, bool on) { +static bool options_setflag_all(const char *name, bool on, uint32_t *flags, const opts_flag_def *list, size_t listsize) { size_t i; - for (i = 0; i < opt_flag_list_count; ++i) { - if (!strcmp(name, opt_flag_list[i].name)) { - longbit lb = opt_flag_list[i].bit; + for (i = 0; i < listsize; ++i) { + if (!strcmp(name, list[i].name)) { + longbit lb = list[i].bit; #if 0 if (on) - opt_flags[lb.idx] |= (1<<(lb.bit)); + flags[lb.idx] |= (1<<(lb.bit)); else - opt_flags[lb.idx] &= ~(1<<(lb.bit)); + flags[lb.idx] &= ~(1<<(lb.bit)); #else if (on) - opt_flags[0] |= (1< 1) { char *argarg; argitem item; @@ -146,17 +162,27 @@ static bool options_parse(int argc, char **argv) { /* All gcc-type long options */ if (options_long_gcc("std", &argc, &argv, &argarg)) { if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) - opt_standard = STD_DEF; + opts_standard = COMPILER_GMQCC; else if (!strcmp(argarg, "qcc")) - opt_standard = STD_QCC; + opts_standard = COMPILER_QCC; else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) - opt_standard = STD_FTE; + opts_standard = COMPILER_FTEQCC; + else if (!strcmp(argarg, "qccx")) + opts_standard = COMPILER_QCCX; else { printf("Unknown standard: %s\n", argarg); return false; } continue; } + if (!strcmp(argv[0]+1, "debug")) { + opts_debug = true; + continue; + } + if (!strcmp(argv[0]+1, "memchk")) { + opts_memchk = true; + continue; + } switch (argv[0][1]) { /* -h, show usage but exit with 0 */ @@ -167,7 +193,16 @@ static bool options_parse(int argc, char **argv) { /* handle all -fflags */ case 'f': - if (!strncmp(argv[0]+2, "no-", 3)) { + util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); + if (!strcmp(argv[0]+2, "HELP")) { + printf("Possible flags:\n"); + for (itr = 0; itr < COUNT_FLAGS; ++itr) { + util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer)); + printf(" -f%s\n", buffer); + } + exit(0); + } + else if (!strncmp(argv[0]+2, "NO_", 3)) { if (!options_setflag(argv[0]+5, false)) { printf("unknown flag: %s\n", argv[0]+2); return false; @@ -178,13 +213,39 @@ static bool options_parse(int argc, char **argv) { return false; } break; + case 'W': + util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); + if (!strcmp(argv[0]+2, "HELP")) { + printf("Possible warnings:\n"); + for (itr = 0; itr < COUNT_WARNINGS; ++itr) { + util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer)); + printf(" -W%s\n", buffer); + } + exit(0); + } + else if (!strcmp(argv[0]+2, "ALL")) { + for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr) + opts_warn[itr] = 0xFFFFFFFFL; + break; + } + if (!strncmp(argv[0]+2, "NO_", 3)) { + if (!options_setwarn(argv[0]+5, false)) { + printf("unknown warning: %s\n", argv[0]+2); + return false; + } + } + else if (!options_setwarn(argv[0]+2, true)) { + printf("unknown warning: %s\n", argv[0]+2); + return false; + } + break; case 'O': if (!options_witharg(&argc, &argv, &argarg)) { printf("option -O requires a numerical argument\n"); return false; } - opt_O = atoi(argarg); + opts_O = atoi(argarg); break; case 'o': @@ -192,7 +253,7 @@ static bool options_parse(int argc, char **argv) { printf("option -o requires an argument: the output file name\n"); return false; } - opt_output = argarg; + opts_output = argarg; break; case 'a': @@ -221,7 +282,7 @@ static bool options_parse(int argc, char **argv) { else { /* All long options with arguments */ if (options_long_witharg("output", &argc, &argv, &argarg)) - opt_output = argarg; + opts_output = argarg; else { printf("Unknown parameter: %s\n", argv[0]); @@ -247,24 +308,59 @@ static bool options_parse(int argc, char **argv) { return true; } +static void options_set(uint32_t *flags, size_t idx, bool on) +{ + longbit lb = LONGBIT(idx); +#if 0 + if (on) + flags[lb.idx] |= (1<<(lb.bit)); + else + flags[lb.idx] &= ~(1<<(lb.bit)); +#else + if (on) + flags[0] |= (1<<(lb)); + else + flags[0] &= ~(1<<(lb)); +#endif +} + +bool parser_init(); +bool parser_compile(const char *filename); +bool parser_finish(const char *output); +void parser_cleanup(); + int main(int argc, char **argv) { size_t itr; + int retval = 0; app_name = argv[0]; + /* default options / warn flags */ + options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true); + if (!options_parse(argc, argv)) { return usage(); } - for (itr = 0; itr < opt_flag_list_count; ++itr) { - printf("Flag %s = %i\n", opt_flag_list[itr].name, OPT_FLAG(itr)); + for (itr = 0; itr < COUNT_FLAGS; ++itr) { + printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); + } + for (itr = 0; itr < COUNT_WARNINGS; ++itr) { + printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); + } + printf("output = %s\n", opts_output); + printf("optimization level = %i\n", (int)opts_O); + printf("standard = %i\n", opts_standard); + + if (!parser_init()) { + printf("failed to initialize parser\n"); + goto cleanup; } - printf("output = %s\n", opt_output); - printf("optimization level = %i\n", (int)opt_O); - printf("standard = %i\n", opt_standard); + + util_debug("COM", "starting ...\n"); if (items_elements) { printf("Mode: manual\n"); - printf("There are %i items to compile:\n", items_elements); + printf("There are %lu items to compile:\n", (unsigned long)items_elements); for (itr = 0; itr < items_elements; ++itr) { printf(" item: %s (%s)\n", items_data[itr].filename, @@ -272,17 +368,25 @@ int main(int argc, char **argv) { (items_data[itr].type == TYPE_ASM ? "asm" : (items_data[itr].type == TYPE_SRC ? "progs.src" : ("unknown")))))); + + if (!parser_compile(items_data[itr].filename)) { + retval = 1; + goto cleanup; + } } + + parser_finish(opts_output); } else { - printf("Mode: progs.src\n"); + printf("Mode: progs.src - not implemented\n"); } - util_debug("COM", "starting ...\n"); - /* stuff */ +cleanup: util_debug("COM", "cleaning ...\n"); + parser_cleanup(); + util_meminfo(); - return 0; + return retval; }