X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=dee9a3293b0bc6765c81ef485265214accc0ce7a;hp=5849b53528e3a509f4c8fd8024d966a483c8fc11;hb=36c5722273f1ea87603621c6ee20b7178a7a641b;hpb=d201cfe6b49f95ba8bcaa0eebb3a6fb7e1a16913 diff --git a/main.c b/main.c index 5849b53..dee9a32 100644 --- a/main.c +++ b/main.c @@ -174,14 +174,14 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.werror, WARN_MISSING_RETURN_VALUES, true); - OPTION_VALUE_U32(OPTION_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); - OPTION_VALUE_U32(OPTION_STANDARD) = COMPILER_QCC; + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCC; } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) { @@ -192,12 +192,12 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, CORRECT_TERNARY, false); opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); - OPTION_VALUE_U32(OPTION_STANDARD) = COMPILER_FTEQCC; + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_FTEQCC; } else if (!strcmp(argarg, "qccx")) { opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); - OPTION_VALUE_U32(OPTION_STANDARD) = COMPILER_QCCX; + OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCCX; } else { con_out("Unknown standard: %s\n", argarg); @@ -207,8 +207,8 @@ static bool options_parse(int argc, char **argv) { } if (options_long_gcc("force-crc", &argc, &argv, &argarg)) { - OPTION_VALUE_BOOL(OPTION_FORCECRC) = true; - OPTION_VALUE_U16 (OPTION_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)) { @@ -248,19 +248,19 @@ static bool options_parse(int argc, char **argv) { } if (!strcmp(argv[0]+1, "debug")) { - OPTION_VALUE_BOOL(OPTION_DEBUG) = true; + OPTS_OPTION_BOOL(OPTION_DEBUG) = true; continue; } if (!strcmp(argv[0]+1, "dump")) { - OPTION_VALUE_BOOL(OPTION_DUMP) = true; + OPTS_OPTION_BOOL(OPTION_DUMP) = true; continue; } if (!strcmp(argv[0]+1, "dumpfin")) { - OPTION_VALUE_BOOL(OPTION_DUMPFIN) = true; + OPTS_OPTION_BOOL(OPTION_DUMPFIN) = true; continue; } if (!strcmp(argv[0]+1, "memchk")) { - OPTION_VALUE_BOOL(OPTION_MEMCHK) = true; + OPTS_OPTION_BOOL(OPTION_MEMCHK) = true; continue; } if (!strcmp(argv[0]+1, "nocolor")) { @@ -280,18 +280,18 @@ static bool options_parse(int argc, char **argv) { exit(0); case 'E': - OPTION_VALUE_BOOL(OPTION_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); - OPTION_VALUE_BOOL(OPTION_G) = true; + OPTS_OPTION_BOOL(OPTION_G) = true; break; case 'q': - OPTION_VALUE_BOOL(OPTION_QUIET) = true; + OPTS_OPTION_BOOL(OPTION_QUIET) = true; break; case 'D': @@ -402,7 +402,7 @@ static bool options_parse(int argc, char **argv) { } if (isdigit(argarg[0])) { uint32_t val = atoi(argarg); - OPTION_VALUE_U32(OPTION_O) = val; + OPTS_OPTION_U32(OPTION_O) = val; opts_setoptimlevel(val); } else { util_strtocmd(argarg, argarg, strlen(argarg)+1); @@ -415,7 +415,7 @@ static bool options_parse(int argc, char **argv) { exit(0); } else if (!strcmp(argarg, "ALL")) - opts_setoptimlevel(OPTION_VALUE_U32(OPTION_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); @@ -436,7 +436,7 @@ static bool options_parse(int argc, char **argv) { con_out("option -o requires an argument: the output file name\n"); return false; } - OPTION_VALUE_STR(OPTION_OUTPUT) = argarg; + OPTS_OPTION_STR(OPTION_OUTPUT) = argarg; opts_output_wasset = true; break; @@ -468,25 +468,25 @@ static bool options_parse(int argc, char **argv) { exit(0); } else if (!strcmp(argv[0]+2, "quiet")) { - OPTION_VALUE_BOOL(OPTION_QUIET) = true; + OPTS_OPTION_BOOL(OPTION_QUIET) = true; break; } else if (!strcmp(argv[0]+2, "correct")) { - OPTION_VALUE_BOOL(OPTION_CORRECTION) = true; + OPTS_OPTION_BOOL(OPTION_CORRECTION) = true; break; } else if (!strcmp(argv[0]+2, "no-correct")) { - OPTION_VALUE_BOOL(OPTION_CORRECTION) = false; + OPTS_OPTION_BOOL(OPTION_CORRECTION) = false; break; } else if (!strcmp(argv[0]+2, "add-info")) { - OPTION_VALUE_BOOL(OPTION_ADD_INFO) = true; + OPTS_OPTION_BOOL(OPTION_ADD_INFO) = true; break; } else { /* All long options with arguments */ if (options_long_witharg("output", &argc, &argv, &argarg)) { - OPTION_VALUE_STR(OPTION_OUTPUT) = argarg; + OPTS_OPTION_STR(OPTION_OUTPUT) = argarg; opts_output_wasset = true; } else { con_out("Unknown parameter: %s\n", argv[0]); @@ -562,10 +562,10 @@ int main(int argc, char **argv) { } /* the standard decides which set of operators to use */ - if (OPTION_VALUE_U32(OPTION_STANDARD) == COMPILER_GMQCC) { + if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_GMQCC) { operators = c_operators; operator_count = c_operator_count; - } else if (OPTION_VALUE_U32(OPTION_STANDARD) == COMPILER_FTEQCC) { + } else if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC) { operators = fte_operators; operator_count = fte_operator_count; } else { @@ -593,22 +593,22 @@ int main(int argc, char **argv) { } } - if (OPTION_VALUE_BOOL(OPTION_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", OPTION_VALUE_STR(OPTION_OUTPUT)); - con_out("optimization level = %u\n", OPTION_VALUE_U32(OPTION_O)); - con_out("standard = %u\n", OPTION_VALUE_U32(OPTION_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 (OPTION_VALUE_BOOL(OPTION_PP_ONLY)) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (opts_output_wasset) { - outfile = file_open(OPTION_VALUE_STR(OPTION_OUTPUT), "wb"); + outfile = file_open(OPTS_OPTION_STR(OPTION_OUTPUT), "wb"); if (!outfile) { - con_err("failed to open `%s` for writing\n", OPTION_VALUE_STR(OPTION_OUTPUT)); + con_err("failed to open `%s` for writing\n", OPTS_OPTION_STR(OPTION_OUTPUT)); retval = 1; goto cleanup; } @@ -618,7 +618,7 @@ int main(int argc, char **argv) { } } - if (!OPTION_VALUE_BOOL(OPTION_PP_ONLY)) { + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (!parser_init()) { con_err("failed to initialize parser\n"); retval = 1; @@ -626,7 +626,7 @@ int main(int argc, char **argv) { } } - if (OPTION_VALUE_BOOL(OPTION_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; @@ -640,7 +640,7 @@ int main(int argc, char **argv) { util_debug("COM", "starting ...\n"); /* add macros */ - if (OPTION_VALUE_BOOL(OPTION_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); @@ -673,7 +673,7 @@ int main(int argc, char **argv) { } if (!opts_output_wasset) { - OPTION_VALUE_STR(OPTION_OUTPUT) = util_strdup(line); + OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line); opts_output_free = true; } @@ -695,15 +695,15 @@ srcdone: goto cleanup; if (vec_size(items)) { - if (!OPTION_VALUE_BOOL(OPTION_QUIET) && - !OPTION_VALUE_BOOL(OPTION_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 (!OPTION_VALUE_BOOL(OPTION_QUIET) && - !OPTION_VALUE_BOOL(OPTION_PP_ONLY)) + if (!OPTS_OPTION_BOOL(OPTION_QUIET) && + !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { con_out(" item: %s (%s)\n", items[itr].filename, @@ -713,7 +713,7 @@ srcdone: ("unknown")))))); } - if (OPTION_VALUE_BOOL(OPTION_PP_ONLY)) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { const char *out; if (!ftepp_preprocess_file(items[itr].filename)) { retval = 1; @@ -755,8 +755,8 @@ srcdone: } ftepp_finish(); - if (!OPTION_VALUE_BOOL(OPTION_PP_ONLY)) { - if (!parser_finish(OPTION_VALUE_STR(OPTION_OUTPUT))) { + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { + if (!parser_finish(OPTS_OPTION_STR(OPTION_OUTPUT))) { retval = 1; goto cleanup; } @@ -764,8 +764,8 @@ srcdone: } /* stuff */ - if (!OPTION_VALUE_BOOL(OPTION_QUIET) && - !OPTION_VALUE_BOOL(OPTION_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]) { @@ -781,10 +781,10 @@ cleanup: vec_free(items); vec_free(ppems); - if (!OPTION_VALUE_BOOL(OPTION_PP_ONLY)) + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) parser_cleanup(); if (opts_output_free) - mem_d(OPTION_VALUE_STR(OPTION_OUTPUT)); + mem_d(OPTS_OPTION_STR(OPTION_OUTPUT)); if (operators_free) mem_d((void*)operators);