X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=e801aaff7ea7d840a658e504273c4b0b99ed2f81;hp=ff0e41dc7f3adc30ef38fbda0d79c61ae2df13c1;hb=ccc2eb32988e4ea371308538c2be625fe374846e;hpb=7a5a328c544f0f555f5ff8de28e27706ce06708c diff --git a/main.c b/main.c index ff0e41d..e801aaf 100644 --- a/main.c +++ b/main.c @@ -53,6 +53,8 @@ static void version() { ); #ifdef GMQCC_GITINFO con_out("git build: %s\n", GMQCC_GITINFO); +#elif defined(GMQCC_VERION_TYPE_DEVEL) + con_out("development build\n"); #endif } @@ -170,13 +172,16 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, INITIALIZED_NONCONSTANTS, true); opts_set(opts.werror, WARN_INVALID_PARAMETER_COUNT, true); opts_set(opts.werror, WARN_MISSING_RETURN_VALUES, true); - opts.standard = COMPILER_GMQCC; + + + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC; } else if (!strcmp(argarg, "qcc")) { opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true); - opts.standard = COMPILER_QCC; + + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCC; } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) { @@ -186,12 +191,13 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true); opts_set(opts.flags, CORRECT_TERNARY, false); opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); - opts.standard = COMPILER_FTEQCC; + + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_FTEQCC; } else if (!strcmp(argarg, "qccx")) { opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); - opts.standard = COMPILER_QCCX; + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCCX; } else { con_out("Unknown standard: %s\n", argarg); @@ -200,8 +206,9 @@ 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); + + OPTS_OPTION_BOOL(OPTION_FORCECRC) = true; + OPTS_OPTION_U16 (OPTION_FORCED_CRC) = strtol(argarg, NULL, 0); continue; } if (options_long_gcc("redirout", &argc, &argv, &redirout)) { @@ -241,19 +248,19 @@ static bool options_parse(int argc, char **argv) { } if (!strcmp(argv[0]+1, "debug")) { - opts.debug = true; + OPTS_OPTION_BOOL(OPTION_DEBUG) = true; continue; } if (!strcmp(argv[0]+1, "dump")) { - opts.dump = true; + OPTS_OPTION_BOOL(OPTION_DUMP) = true; continue; } if (!strcmp(argv[0]+1, "dumpfin")) { - opts.dumpfin = true; + OPTS_OPTION_BOOL(OPTION_DUMPFIN) = true; continue; } if (!strcmp(argv[0]+1, "memchk")) { - opts.memchk = true; + OPTS_OPTION_BOOL(OPTION_MEMCHK) = true; continue; } if (!strcmp(argv[0]+1, "nocolor")) { @@ -273,18 +280,18 @@ static bool options_parse(int argc, char **argv) { exit(0); case 'E': - opts.pp_only = true; + OPTS_OPTION_BOOL(OPTION_PP_ONLY) = true; opts_set(opts.flags, FTEPP_PREDEFS, true); /* predefs on for -E */ break; /* debug turns on -flno */ case 'g': opts_setflag("LNO", true); - opts.g = true; + OPTS_OPTION_BOOL(OPTION_G) = true; break; case 'q': - opts.quiet = true; + OPTS_OPTION_BOOL(OPTION_QUIET) = true; break; case 'D': @@ -308,7 +315,7 @@ static bool options_parse(int argc, char **argv) { case 'f': util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); if (!strcmp(argv[0]+2, "HELP") || *(argv[0]+2) == '?') { - con_out("Possible flags:\n"); + con_out("Possible flags:\n\n"); for (itr = 0; itr < COUNT_FLAGS; ++itr) { util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer)); con_out(" -f%s\n", buffer); @@ -333,6 +340,8 @@ static bool options_parse(int argc, char **argv) { for (itr = 0; itr < COUNT_WARNINGS; ++itr) { util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer)); con_out(" -W%s\n", buffer); + if (itr == WARN_DEBUG) + con_out(" Warnings included by -Wall:\n"); } exit(0); } @@ -394,8 +403,9 @@ static bool options_parse(int argc, char **argv) { return false; } if (isdigit(argarg[0])) { - opts.O = atoi(argarg); - opts_setoptimlevel(opts.O); + uint32_t val = atoi(argarg); + OPTS_OPTION_U32(OPTION_O) = val; + opts_setoptimlevel(val); } else { util_strtocmd(argarg, argarg, strlen(argarg)+1); if (!strcmp(argarg, "HELP")) { @@ -407,7 +417,7 @@ static bool options_parse(int argc, char **argv) { exit(0); } else if (!strcmp(argarg, "ALL")) - opts_setoptimlevel(opts.O = 9999); + opts_setoptimlevel(OPTS_OPTION_U32(OPTION_O) = 9999); else if (!strncmp(argarg, "NO_", 3)) { if (!opts_setoptim(argarg+3, false)) { con_out("unknown optimization: %s\n", argarg+3); @@ -428,7 +438,7 @@ static bool options_parse(int argc, char **argv) { con_out("option -o requires an argument: the output file name\n"); return false; } - opts.output = argarg; + OPTS_OPTION_STR(OPTION_OUTPUT) = argarg; opts_output_wasset = true; break; @@ -460,13 +470,25 @@ static bool options_parse(int argc, char **argv) { exit(0); } else if (!strcmp(argv[0]+2, "quiet")) { - opts.quiet = true; + OPTS_OPTION_BOOL(OPTION_QUIET) = true; + break; + } + else if (!strcmp(argv[0]+2, "correct")) { + OPTS_OPTION_BOOL(OPTION_CORRECTION) = true; + break; + } + else if (!strcmp(argv[0]+2, "no-correct")) { + OPTS_OPTION_BOOL(OPTION_CORRECTION) = false; + break; + } + else if (!strcmp(argv[0]+2, "add-info")) { + OPTS_OPTION_BOOL(OPTION_ADD_INFO) = true; break; } else { /* All long options with arguments */ if (options_long_witharg("output", &argc, &argv, &argarg)) { - opts.output = argarg; + OPTS_OPTION_STR(OPTION_OUTPUT) = argarg; opts_output_wasset = true; } else { con_out("Unknown parameter: %s\n", argv[0]); @@ -500,7 +522,7 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) { char *end; line = *out; - len = file_getline(&line, alen, src); + len = fs_file_getline(&line, alen, src); if (len == -1) return false; @@ -542,10 +564,10 @@ int main(int argc, char **argv) { } /* the standard decides which set of operators to use */ - if (opts.standard == COMPILER_GMQCC) { + if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_GMQCC) { operators = c_operators; operator_count = c_operator_count; - } else if (opts.standard == COMPILER_FTEQCC) { + } else if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC) { operators = fte_operators; operator_count = fte_operator_count; } else { @@ -573,22 +595,22 @@ int main(int argc, char **argv) { } } - if (opts.dump) { + if (OPTS_OPTION_BOOL(OPTION_DUMP)) { for (itr = 0; itr < COUNT_FLAGS; ++itr) con_out("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); for (itr = 0; itr < COUNT_WARNINGS; ++itr) con_out("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); - con_out("output = %s\n", opts.output); - con_out("optimization level = %d\n", opts.O); - con_out("standard = %i\n", opts.standard); + con_out("output = %s\n", OPTS_OPTION_STR(OPTION_OUTPUT)); + con_out("optimization level = %u\n", OPTS_OPTION_U32(OPTION_O)); + con_out("standard = %u\n", OPTS_OPTION_U32(OPTION_STANDARD)); } - if (opts.pp_only) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (opts_output_wasset) { - outfile = file_open(opts.output, "wb"); + outfile = fs_file_open(OPTS_OPTION_STR(OPTION_OUTPUT), "wb"); if (!outfile) { - con_err("failed to open `%s` for writing\n", opts.output); + con_err("failed to open `%s` for writing\n", OPTS_OPTION_STR(OPTION_OUTPUT)); retval = 1; goto cleanup; } @@ -598,7 +620,7 @@ int main(int argc, char **argv) { } } - if (!opts.pp_only) { + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (!parser_init()) { con_err("failed to initialize parser\n"); retval = 1; @@ -606,7 +628,7 @@ int main(int argc, char **argv) { } } - if (opts.pp_only || OPTS_FLAG(FTEPP)) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) { if (!ftepp_init()) { con_err("failed to initialize parser\n"); retval = 1; @@ -620,7 +642,7 @@ int main(int argc, char **argv) { util_debug("COM", "starting ...\n"); /* add macros */ - if (opts.pp_only || OPTS_FLAG(FTEPP)) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) { for (itr = 0; itr < vec_size(ppems); itr++) { ftepp_add_macro(ppems[itr].name, ppems[itr].value); mem_d(ppems[itr].name); @@ -638,7 +660,7 @@ int main(int argc, char **argv) { progs_src = true; - src = file_open("progs.src", "rb"); + src = fs_file_open("progs.src", "rb"); if (!src) { con_err("failed to open `progs.src` for reading\n"); retval = 1; @@ -653,7 +675,7 @@ int main(int argc, char **argv) { } if (!opts_output_wasset) { - opts.output = util_strdup(line); + OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line); opts_output_free = true; } @@ -667,7 +689,7 @@ int main(int argc, char **argv) { } srcdone: - file_close(src); + fs_file_close(src); mem_d(line); } @@ -675,12 +697,16 @@ srcdone: goto cleanup; if (vec_size(items)) { - if (!opts.quiet && !opts.pp_only) { + if (!OPTS_OPTION_BOOL(OPTION_QUIET) && + !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + { con_out("Mode: %s\n", (progs_src ? "progs.src" : "manual")); con_out("There are %lu items to compile:\n", (unsigned long)vec_size(items)); } for (itr = 0; itr < vec_size(items); ++itr) { - if (!opts.quiet && !opts.pp_only) { + if (!OPTS_OPTION_BOOL(OPTION_QUIET) && + !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + { con_out(" item: %s (%s)\n", items[itr].filename, ( (items[itr].type == TYPE_QC ? "qc" : @@ -689,7 +715,7 @@ srcdone: ("unknown")))))); } - if (opts.pp_only) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { const char *out; if (!ftepp_preprocess_file(items[itr].filename)) { retval = 1; @@ -697,7 +723,7 @@ srcdone: } out = ftepp_get(); if (out) - file_printf(outfile, "%s", out); + fs_file_printf(outfile, "%s", out); ftepp_flush(); } else { @@ -731,8 +757,8 @@ srcdone: } ftepp_finish(); - if (!opts.pp_only) { - if (!parser_finish(opts.output)) { + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { + if (!parser_finish(OPTS_OPTION_STR(OPTION_OUTPUT))) { retval = 1; goto cleanup; } @@ -740,7 +766,9 @@ srcdone: } /* stuff */ - if (!opts.quiet && !opts.pp_only) { + if (!OPTS_OPTION_BOOL(OPTION_QUIET) && + !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + { for (itr = 0; itr < COUNT_OPTIMIZATIONS; ++itr) { if (opts_optimizationcount[itr]) { con_out("%s: %u\n", opts_opt_list[itr].name, (unsigned int)opts_optimizationcount[itr]); @@ -755,10 +783,10 @@ cleanup: vec_free(items); vec_free(ppems); - if (!opts.pp_only) + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) parser_cleanup(); if (opts_output_free) - mem_d((char*)opts.output); + mem_d(OPTS_OPTION_STR(OPTION_OUTPUT)); if (operators_free) mem_d((void*)operators);