X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=b483db9880d1dd4b4de6a19f2515e5aee3c6f4af;hb=245908f4916702dc006584634894058ddff37b4e;hp=2980f8bfa40c690fca719838dbb621598112e863;hpb=a002041ec2f53723425c972e235b9a88328459ab;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index 2980f8b..b483db9 100644 --- a/main.c +++ b/main.c @@ -23,8 +23,6 @@ #include "gmqcc.h" #include "lexer.h" -#include - uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)]; @@ -36,7 +34,8 @@ bool opts_memchk = false; bool opts_dump = false; bool opts_werror = false; bool opts_forcecrc = false; -bool opts_benchmark = false; +bool opts_pp_only = false; +size_t opts_max_array_size = 1024; uint16_t opts_forced_crc; @@ -47,7 +46,7 @@ const oper_info *operators = NULL; size_t operator_count = 0; typedef struct { char *filename; int type; } argitem; -VECTOR_MAKE(argitem, items); +static argitem *items = NULL; #define TYPE_QC 0 #define TYPE_ASM 1 @@ -56,30 +55,30 @@ VECTOR_MAKE(argitem, items); static const char *app_name; static int usage() { - printf("usage: %s [options] [files...]", app_name); - printf("options:\n" + con_out("usage: %s [options] [files...]", app_name); + con_out("options:\n" " -h, --help show this help message\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" + con_out(" -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(" -f enable a flag\n" + con_out(" -E stop after preprocessing\n"); + con_out(" -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" + con_out(" -W enable a warning\n" " -Wno- disable a warning\n" - " -Wall enable all warnings\n"); - printf(" -force-crc=num force a specific checksum into the header\n"); - printf("\n"); - printf("flags:\n" - " -fdarkplaces-string-table-bug\n" - " patch the string table to work with some bugged darkplaces versions\n" - " -fomit-nullbytes\n" - " omits certain null-bytes for a smaller output - requires a patched engine\n" + " -Wall enable all warnings\n" + " -Werror treat warnings as errors\n"); + con_out(" -force-crc=num force a specific checksum into the header\n"); + con_out("\n"); + con_out("flags:\n" + " -fadjust-vector-fields\n" + " when assigning a vector field, its _y and _z fields also get assigned\n" ); return -1; } @@ -163,10 +162,29 @@ static bool options_long_gcc(const char *optname, int *argc_, char ***argv_, cha return options_long_witharg_all(optname, argc_, argv_, out, 1, false); } +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 +} + static bool options_parse(int argc, char **argv) { bool argend = false; size_t itr; - char buffer[1024]; + char buffer[1024]; + char *redirout = (char*)stdout; + char *redirerr = (char*)stderr; + while (!argend && argc > 1) { char *argarg; argitem item; @@ -177,16 +195,20 @@ static bool options_parse(int argc, char **argv) { if (argv[0][0] == '-') { /* All gcc-type long options */ if (options_long_gcc("std", &argc, &argv, &argarg)) { - if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) + if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, true); opts_standard = COMPILER_GMQCC; - else if (!strcmp(argarg, "qcc")) + } else if (!strcmp(argarg, "qcc")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); opts_standard = COMPILER_QCC; - else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) + } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); opts_standard = COMPILER_FTEQCC; - else if (!strcmp(argarg, "qccx")) + } else if (!strcmp(argarg, "qccx")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); opts_standard = COMPILER_QCCX; - else { - printf("Unknown standard: %s\n", argarg); + } else { + con_out("Unknown standard: %s\n", argarg); return false; } continue; @@ -196,6 +218,15 @@ static bool options_parse(int argc, char **argv) { opts_forced_crc = strtol(argarg, NULL, 0); continue; } + if (options_long_gcc("redirout", &argc, &argv, &redirout)) { + continue; + } + if (options_long_gcc("redirerr", &argc, &argv, &redirerr)) { + continue; + } + + con_change(redirout, redirerr); + if (!strcmp(argv[0]+1, "debug")) { opts_debug = true; continue; @@ -208,8 +239,8 @@ static bool options_parse(int argc, char **argv) { opts_memchk = true; continue; } - if (!strcmp(argv[0]+1, "benchmark")) { - opts_benchmark = true; + if (!strcmp(argv[0]+1, "nocolor")) { + con_color(0); continue; } @@ -220,35 +251,39 @@ static bool options_parse(int argc, char **argv) { exit(0); break; + case 'E': + opts_pp_only = true; + break; + /* handle all -fflags */ case 'f': util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); if (!strcmp(argv[0]+2, "HELP")) { - printf("Possible flags:\n"); + con_out("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); + con_out(" -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); + con_out("unknown flag: %s\n", argv[0]+2); return false; } } else if (!options_setflag(argv[0]+2, true)) { - printf("unknown flag: %s\n", argv[0]+2); + con_out("unknown flag: %s\n", argv[0]+2); 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"); + con_out("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); + con_out(" -W%s\n", buffer); } exit(0); } @@ -272,19 +307,19 @@ static bool options_parse(int argc, char **argv) { } if (!strncmp(argv[0]+2, "NO_", 3)) { if (!options_setwarn(argv[0]+5, false)) { - printf("unknown warning: %s\n", argv[0]+2); + con_out("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); + con_out("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"); + con_out("option -O requires a numerical argument\n"); return false; } opts_O = atoi(argarg); @@ -292,7 +327,7 @@ static bool options_parse(int argc, char **argv) { case 'o': if (!options_witharg(&argc, &argv, &argarg)) { - printf("option -o requires an argument: the output file name\n"); + con_out("option -o requires an argument: the output file name\n"); return false; } opts_output = argarg; @@ -303,12 +338,12 @@ static bool options_parse(int argc, char **argv) { case 's': item.type = argv[0][1] == 'a' ? TYPE_ASM : TYPE_SRC; if (!options_witharg(&argc, &argv, &argarg)) { - printf("option -a requires a filename %s\n", + con_out("option -a requires a filename %s\n", (argv[0][1] == 'a' ? "containing QC-asm" : "containing a progs.src formatted list")); return false; } item.filename = argarg; - items_add(item); + vec_push(items, item); break; case '-': @@ -328,14 +363,14 @@ static bool options_parse(int argc, char **argv) { opts_output = argarg; opts_output_wasset = true; } else { - printf("Unknown parameter: %s\n", argv[0]); + con_out("Unknown parameter: %s\n", argv[0]); return false; } } break; default: - printf("Unknown parameter: %s\n", argv[0]); + con_out("Unknown parameter: %s\n", argv[0]); return false; } } @@ -345,31 +380,14 @@ static bool options_parse(int argc, char **argv) { argitem item; item.filename = argv[0]; item.type = TYPE_QC; - items_add(item); + vec_push(items, item); } } 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 -} - /* returns the line number, or -1 on error */ -static bool progs_nextline(char **out, size_t *alen,FILE *src) -{ +static bool progs_nextline(char **out, size_t *alen,FILE *src) { int len; char *line; char *start; @@ -399,9 +417,8 @@ int main(int argc, char **argv) { int retval = 0; bool opts_output_free = false; - struct timespec ta, tb, tc; - app_name = argv[0]; + con_init(); /* default options / warn flags */ options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true); @@ -417,6 +434,10 @@ int main(int argc, char **argv) { options_set(opts_warn, WARN_FRAME_MACROS, true); options_set(opts_warn, WARN_UNUSED_VARIABLE, true); options_set(opts_warn, WARN_EFFECTLESS_STATEMENT, true); + options_set(opts_warn, WARN_END_SYS_FIELDS, true); + options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true); + + options_set(opts_flags, ADJUST_VECTOR_FIELDS, true); if (!options_parse(argc, argv)) { return usage(); @@ -433,65 +454,63 @@ int main(int argc, char **argv) { if (opts_dump) { for (itr = 0; itr < COUNT_FLAGS; ++itr) { - printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); + con_out("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)); + con_out("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); + con_out("output = %s\n", opts_output); + con_out("optimization level = %i\n", (int)opts_O); + con_out("standard = %i\n", opts_standard); } if (!parser_init()) { - printf("failed to initialize parser\n"); + con_out("failed to initialize parser\n"); retval = 1; goto cleanup; } util_debug("COM", "starting ...\n"); - if (items_elements) { - printf("Mode: manual\n"); - printf("There are %lu items to compile:\n", (unsigned long)items_elements); - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &ta); - for (itr = 0; itr < items_elements; ++itr) { - printf(" item: %s (%s)\n", - items_data[itr].filename, - ( (items_data[itr].type == TYPE_QC ? "qc" : - (items_data[itr].type == TYPE_ASM ? "asm" : - (items_data[itr].type == TYPE_SRC ? "progs.src" : + if (vec_size(items)) { + con_out("Mode: manual\n"); + con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items)); + for (itr = 0; itr < vec_size(items); ++itr) { + con_out(" item: %s (%s)\n", + items[itr].filename, + ( (items[itr].type == TYPE_QC ? "qc" : + (items[itr].type == TYPE_ASM ? "asm" : + (items[itr].type == TYPE_SRC ? "progs.src" : ("unknown")))))); - if (!parser_compile(items_data[itr].filename)) { - retval = 1; - goto cleanup; + if (!parser_compile_file(items[itr].filename)) + { + retval = 1; + goto cleanup; } } - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &tb); - parser_finish(opts_output); - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &tc); + if (!parser_finish(opts_output)) { + retval = 1; + goto cleanup; + } } else { FILE *src; char *line; size_t linelen = 0; - printf("Mode: progs.src\n"); + con_out("Mode: progs.src\n"); src = util_fopen("progs.src", "rb"); if (!src) { - printf("failed to open `progs.src` for reading\n"); + con_out("failed to open `progs.src` for reading\n"); retval = 1; goto cleanup; } line = NULL; if (!progs_nextline(&line, &linelen, src) || !line[0]) { - printf("illformatted progs.src file: expected output filename in first line\n"); + con_out("illformatted progs.src file: expected output filename in first line\n"); retval = 1; goto srcdone; } @@ -501,51 +520,29 @@ int main(int argc, char **argv) { opts_output_free = true; } - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &ta); while (progs_nextline(&line, &linelen, src)) { if (!line[0] || (line[0] == '/' && line[1] == '/')) continue; - printf(" src: %s\n", line); - if (!parser_compile(line)) { + con_out(" src: %s\n", line); + if (!parser_compile_file(line)) { retval = 1; goto srcdone; } } - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &tb); parser_finish(opts_output); - if (opts_benchmark) - clock_gettime(CLOCK_MONOTONIC, &tc); srcdone: fclose(src); mem_d(line); } - if (opts_benchmark) - { - printf("started parsing at: %lu:%09lu\n", (unsigned long)ta.tv_sec, (unsigned long)ta.tv_nsec); - printf("started codegen at: %lu:%09lu\n", (unsigned long)tb.tv_sec, (unsigned long)tb.tv_nsec); - printf(" finished at: %lu:%09lu\n", (unsigned long)tc.tv_sec, (unsigned long)tc.tv_nsec); - { - size_t sec = tb.tv_sec - ta.tv_sec; - size_t nsec = (tb.tv_nsec + sec * 1000000000L) - ta.tv_nsec; - printf("Parsing took %lu\n", (unsigned long)nsec); - } - { - size_t sec = tc.tv_sec - tb.tv_sec; - size_t nsec = (tc.tv_nsec + sec * 1000000000L) - tb.tv_nsec; - printf("Codegen took %lu\n", (unsigned long)nsec); - } - } /* stuff */ cleanup: util_debug("COM", "cleaning ...\n"); - - mem_d(items_data); + con_close(); + vec_free(items); parser_cleanup(); if (opts_output_free)