X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=2980f8bfa40c690fca719838dbb621598112e863;hb=a002041ec2f53723425c972e235b9a88328459ab;hp=c2e7a8d6cc842fa3af86aa51d62de288ffeb2a14;hpb=f2bbffbd4b2247b116afbaf2f12fa02647130da2;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index c2e7a8d..2980f8b 100644 --- a/main.c +++ b/main.c @@ -21,6 +21,9 @@ * SOFTWARE. */ #include "gmqcc.h" +#include "lexer.h" + +#include uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)]; @@ -30,6 +33,18 @@ const char *opts_output = "progs.dat"; int opts_standard = COMPILER_GMQCC; bool opts_debug = false; bool opts_memchk = false; +bool opts_dump = false; +bool opts_werror = false; +bool opts_forcecrc = false; +bool opts_benchmark = false; + +uint16_t opts_forced_crc; + +static bool opts_output_wasset = false; + +/* set by the standard */ +const oper_info *operators = NULL; +size_t operator_count = 0; typedef struct { char *filename; int type; } argitem; VECTOR_MAKE(argitem, items); @@ -58,6 +73,7 @@ static int usage() { printf(" -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" @@ -175,14 +191,27 @@ static bool options_parse(int argc, char **argv) { } continue; } + if (options_long_gcc("force-crc", &argc, &argv, &argarg)) { + opts_forcecrc = true; + opts_forced_crc = strtol(argarg, NULL, 0); + continue; + } if (!strcmp(argv[0]+1, "debug")) { opts_debug = true; continue; } + if (!strcmp(argv[0]+1, "dump")) { + opts_dump = true; + continue; + } if (!strcmp(argv[0]+1, "memchk")) { opts_memchk = true; continue; } + if (!strcmp(argv[0]+1, "benchmark")) { + opts_benchmark = true; + continue; + } switch (argv[0][1]) { /* -h, show usage but exit with 0 */ @@ -223,6 +252,19 @@ static bool options_parse(int argc, char **argv) { } exit(0); } + else if (!strcmp(argv[0]+2, "NO_ERROR")) { + opts_werror = false; + break; + } + else if (!strcmp(argv[0]+2, "ERROR")) { + opts_werror = true; + break; + } + else if (!strcmp(argv[0]+2, "NONE")) { + for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr) + opts_warn[itr] = 0; + break; + } else if (!strcmp(argv[0]+2, "ALL")) { for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr) opts_warn[itr] = 0xFFFFFFFFL; @@ -254,6 +296,7 @@ static bool options_parse(int argc, char **argv) { return false; } opts_output = argarg; + opts_output_wasset = true; break; case 'a': @@ -281,10 +324,10 @@ static bool options_parse(int argc, char **argv) { } else { /* All long options with arguments */ - if (options_long_witharg("output", &argc, &argv, &argarg)) + if (options_long_witharg("output", &argc, &argv, &argarg)) { opts_output = argarg; - else - { + opts_output_wasset = true; + } else { printf("Unknown parameter: %s\n", argv[0]); return false; } @@ -324,35 +367,85 @@ static void options_set(uint32_t *flags, size_t idx, bool on) #endif } -bool parser_init(); -bool parser_compile(const char *filename); -bool parser_finish(const char *output); -void parser_cleanup(); +/* returns the line number, or -1 on error */ +static bool progs_nextline(char **out, size_t *alen,FILE *src) +{ + int len; + char *line; + char *start; + char *end; + + line = *out; + len = util_getline(&line, alen, src); + if (len == -1) + return false; + + /* start at first non-blank */ + for (start = line; isspace(*start); ++start) {} + /* end at the first non-blank */ + for (end = start; *end && !isspace(*end); ++end) {} + + *out = line; + /* move the actual filename to the beginning */ + while (start != end) { + *line++ = *start++; + } + *line = 0; + return true; +} int main(int argc, char **argv) { size_t itr; int retval = 0; + bool opts_output_free = false; + + struct timespec ta, tb, tc; + app_name = argv[0]; /* default options / warn flags */ options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true); + options_set(opts_warn, WARN_EXTENSIONS, true); + options_set(opts_warn, WARN_FIELD_REDECLARED, true); + options_set(opts_warn, WARN_TOO_FEW_PARAMETERS, true); + options_set(opts_warn, WARN_MISSING_RETURN_VALUES, true); + options_set(opts_warn, WARN_USED_UNINITIALIZED, true); + options_set(opts_warn, WARN_LOCAL_CONSTANTS, true); + options_set(opts_warn, WARN_VOID_VARIABLES, true); + options_set(opts_warn, WARN_IMPLICIT_FUNCTION_POINTER, true); + options_set(opts_warn, WARN_VARIADIC_FUNCTION, true); + options_set(opts_warn, WARN_FRAME_MACROS, true); + options_set(opts_warn, WARN_UNUSED_VARIABLE, true); + options_set(opts_warn, WARN_EFFECTLESS_STATEMENT, true); if (!options_parse(argc, argv)) { return usage(); } - for (itr = 0; itr < COUNT_FLAGS; ++itr) { - printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); + /* the standard decides which set of operators to use */ + if (opts_standard == COMPILER_GMQCC) { + operators = c_operators; + operator_count = c_operator_count; + } else { + operators = qcc_operators; + operator_count = qcc_operator_count; } - for (itr = 0; itr < COUNT_WARNINGS; ++itr) { - printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); + + if (opts_dump) { + 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); } - 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"); + retval = 1; goto cleanup; } @@ -361,6 +454,8 @@ int main(int argc, char **argv) { 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, @@ -375,9 +470,74 @@ int main(int argc, char **argv) { } } + if (opts_benchmark) + clock_gettime(CLOCK_MONOTONIC, &tb); parser_finish(opts_output); + if (opts_benchmark) + clock_gettime(CLOCK_MONOTONIC, &tc); + } else { - printf("Mode: progs.src - not implemented\n"); + FILE *src; + char *line; + size_t linelen = 0; + + printf("Mode: progs.src\n"); + src = util_fopen("progs.src", "rb"); + if (!src) { + printf("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"); + retval = 1; + goto srcdone; + } + + if (!opts_output_wasset) { + opts_output = util_strdup(line); + 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)) { + 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 */ @@ -385,8 +545,13 @@ int main(int argc, char **argv) { cleanup: util_debug("COM", "cleaning ...\n"); + mem_d(items_data); + parser_cleanup(); + if (opts_output_free) + mem_d((char*)opts_output); + lex_cleanup(); util_meminfo(); return retval; }