X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=bbc685a05fdb69bb2b8e7d31071e7d620468df58;hp=8394df45ec3c3192d9f573b56a7cedd79a2b202a;hb=69b55ccc03b56af1f6c05eb45866ab198307487f;hpb=6cd821d4594ba94ad387c9346119d71897f0489e diff --git a/main.c b/main.c index 8394df4..bbc685a 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013 * Dale Weiler * Wolfgang Bumiller * @@ -23,6 +23,7 @@ */ #include "gmqcc.h" #include "lexer.h" +#include /* TODO: cleanup this whole file .. it's a fuckign mess */ @@ -43,7 +44,7 @@ static ppitem *ppems = NULL; static const char *app_name; static void version() { - con_out("GMQCC %d.%d.%d Built %s %s\n", + con_out("GMQCC %d.%d.%d Built %s %s\n" GMQCC_DEV_VERSION_STRING, GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH, @@ -61,6 +62,7 @@ static int usage() { con_out(" -o, --output=file output file, defaults to progs.dat\n" " -s filename add a progs.src file to be used\n"); con_out(" -E stop after preprocessing\n"); + con_out(" -q, --quiet be less verbose\n"); con_out(" -config file use the specified ini file\n"); con_out(" -std=standard select one of the following standards\n" " -std=qcc original QuakeC\n" @@ -139,9 +141,10 @@ static bool options_parse(int argc, char **argv) { bool argend = false; size_t itr; char buffer[1024]; - char *redirout = (char*)stdout; - char *redirerr = (char*)stderr; - char *config = NULL; + char *redirout = NULL; + char *redirerr = NULL; + char *config = NULL; + char *memdumpcols = NULL; while (!argend && argc > 1) { char *argarg; @@ -156,14 +159,26 @@ static bool options_parse(int argc, char **argv) { if (options_long_gcc("std", &argc, &argv, &argarg)) { if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) { - opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true); - opts.standard = COMPILER_GMQCC; + opts_set(opts.flags, ADJUST_VECTOR_FIELDS, true); + opts_set(opts.flags, CORRECT_LOGIC, true); + opts_set(opts.flags, FALSE_EMPTY_STRINGS, false); + opts_set(opts.flags, TRUE_EMPTY_STRINGS, true); + opts_set(opts.flags, LOOP_LABELS, true); + opts_set(opts.flags, TRANSLATABLE_STRINGS, true); + 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_set(opts.flags, EXPRESSIONS_FOR_BUILTINS, true); + + + 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")) { @@ -171,14 +186,15 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, TRANSLATABLE_STRINGS, true); opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true); - opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); opts_set(opts.flags, CORRECT_TERNARY, false); - opts.standard = COMPILER_FTEQCC; + opts_set(opts.warn, WARN_TERNARY_PRECEDENCE, true); + + 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); @@ -187,8 +203,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)) { @@ -203,11 +220,13 @@ static bool options_parse(int argc, char **argv) { config = argarg; continue; } + if (options_long_gcc("memdumpcols", &argc, &argv, &memdumpcols)) { + OPTS_OPTION_U16(OPTION_MEMDUMPCOLS) = (uint16_t)strtol(memdumpcols, NULL, 10); + continue; + } /* show defaults (like pathscale) */ if (!strcmp(argv[0]+1, "show-defaults")) { - size_t itr; - char buffer[1024]; for (itr = 0; itr < COUNT_FLAGS; ++itr) { if (!OPTS_FLAG(itr)) continue; @@ -230,19 +249,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")) { @@ -262,13 +281,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_OPTION_BOOL(OPTION_QUIET) = true; break; case 'D': @@ -292,7 +316,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); @@ -317,6 +341,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); } @@ -330,8 +356,10 @@ static bool options_parse(int argc, char **argv) { else if (!strcmp(argv[0]+2, "ERROR") || !strcmp(argv[0]+2, "ERROR_ALL")) { + opts_backup_non_Werror_all(); for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr) opts.werror[itr] = 0xFFFFFFFFL; + opts_restore_non_Werror_all(); break; } else if (!strcmp(argv[0]+2, "NONE")) { @@ -340,8 +368,10 @@ static bool options_parse(int argc, char **argv) { break; } else if (!strcmp(argv[0]+2, "ALL")) { + opts_backup_non_Wall(); for (itr = 0; itr < sizeof(opts.warn)/sizeof(opts.warn[0]); ++itr) opts.warn[itr] = 0xFFFFFFFFL; + opts_restore_non_Wall(); break; } else if (!strncmp(argv[0]+2, "ERROR_", 6)) { @@ -374,8 +404,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 = (uint32_t)strtol(argarg, NULL, 10); + OPTS_OPTION_U32(OPTION_O) = val; + opts_setoptimlevel(val); } else { util_strtocmd(argarg, argarg, strlen(argarg)+1); if (!strcmp(argarg, "HELP")) { @@ -387,7 +418,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); @@ -408,7 +439,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; @@ -439,10 +470,26 @@ static bool options_parse(int argc, char **argv) { version(); exit(0); } + else if (!strcmp(argv[0]+2, "quiet")) { + 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]); @@ -476,7 +523,7 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) { char *end; line = *out; - len = util_getline(&line, alen, src); + len = fs_file_getline(&line, alen, src); if (len == -1) return false; @@ -495,26 +542,35 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) { } int main(int argc, char **argv) { - size_t itr; - int retval = 0; - bool opts_output_free = false; - bool operators_free = false; - bool progs_src = false; - FILE *outfile = NULL; + size_t itr; + int retval = 0; + bool opts_output_free = false; + bool operators_free = false; + bool progs_src = false; + FILE *outfile = NULL; + struct parser_s *parser = NULL; + struct ftepp_s *ftepp = NULL; app_name = argv[0]; con_init (); opts_init("progs.dat", COMPILER_GMQCC, (1024 << 3)); + util_seed(time(0)); + if (!options_parse(argc, argv)) { return usage(); } + if (OPTS_FLAG(TRUE_EMPTY_STRINGS) && OPTS_FLAG(FALSE_EMPTY_STRINGS)) { + con_err("-ftrue-empty-strings and -ffalse-empty-strings are mutually exclusive"); + exit(EXIT_FAILURE); + } + /* 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 { @@ -530,10 +586,10 @@ int main(int argc, char **argv) { operators[operator_count-1].id != opid2(':','?')) { con_err("internal error: operator precedence table wasn't updated correctly!\n"); - exit(1); + exit(EXIT_FAILURE); } operators_free = true; - newops = mem_a(sizeof(operators[0]) * operator_count); + newops = (oper_info*)mem_a(sizeof(operators[0]) * operator_count); memcpy(newops, operators, sizeof(operators[0]) * operator_count); memcpy(&newops[operator_count-2], &operators[operator_count-1], sizeof(newops[0])); memcpy(&newops[operator_count-1], &operators[operator_count-2], sizeof(newops[0])); @@ -542,40 +598,41 @@ 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 = util_fopen(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; } } - else - outfile = stdout; + else { + outfile = con_default_out(); + } } - if (!opts.pp_only) { - if (!parser_init()) { + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { + if (!(parser = parser_create())) { con_err("failed to initialize parser\n"); retval = 1; goto cleanup; } } - if (opts.pp_only || OPTS_FLAG(FTEPP)) { - if (!ftepp_init()) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) { + if (!(ftepp = ftepp_create())) { con_err("failed to initialize parser\n"); retval = 1; goto cleanup; @@ -585,9 +642,9 @@ 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); + ftepp_add_macro(ftepp, ppems[itr].name, ppems[itr].value); mem_d(ppems[itr].name); /* can be null */ @@ -603,7 +660,7 @@ int main(int argc, char **argv) { progs_src = true; - src = util_fopen("progs.src", "rb"); + src = fs_file_open("progs.src", "rb"); if (!src) { con_err("failed to open `progs.src` for reading\n"); retval = 1; @@ -618,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; } @@ -632,7 +689,7 @@ int main(int argc, char **argv) { } srcdone: - fclose(src); + fs_file_close(src); mem_d(line); } @@ -640,12 +697,17 @@ srcdone: goto cleanup; if (vec_size(items)) { - if (!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.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" : @@ -654,35 +716,35 @@ srcdone: ("unknown")))))); } - if (opts.pp_only) { + if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { const char *out; - if (!ftepp_preprocess_file(items[itr].filename)) { + if (!ftepp_preprocess_file(ftepp, items[itr].filename)) { retval = 1; goto cleanup; } - out = ftepp_get(); + out = ftepp_get(ftepp); if (out) - fprintf(outfile, "%s", out); - ftepp_flush(); + fs_file_printf(outfile, "%s", out); + ftepp_flush(ftepp); } else { if (OPTS_FLAG(FTEPP)) { const char *data; - if (!ftepp_preprocess_file(items[itr].filename)) { + if (!ftepp_preprocess_file(ftepp, items[itr].filename)) { retval = 1; goto cleanup; } - data = ftepp_get(); + data = ftepp_get(ftepp); if (vec_size(data)) { - if (!parser_compile_string_len(items[itr].filename, data, vec_size(data))) { + if (!parser_compile_string(parser, items[itr].filename, data, vec_size(data))) { retval = 1; goto cleanup; } } - ftepp_flush(); + ftepp_flush(ftepp); } else { - if (!parser_compile_file(items[itr].filename)) { + if (!parser_compile_file(parser, items[itr].filename)) { retval = 1; goto cleanup; } @@ -695,9 +757,10 @@ srcdone: } } - ftepp_finish(); - if (!opts.pp_only) { - if (!parser_finish(opts.output)) { + ftepp_finish(ftepp); + ftepp = NULL; + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { + if (!parser_finish(parser, OPTS_OPTION_STR(OPTION_OUTPUT))) { retval = 1; goto cleanup; } @@ -705,7 +768,9 @@ srcdone: } /* stuff */ - if (!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]); @@ -715,15 +780,16 @@ srcdone: cleanup: util_debug("COM", "cleaning ...\n"); - ftepp_finish(); + if (ftepp) + ftepp_finish(ftepp); con_close(); vec_free(items); vec_free(ppems); - if (!opts.pp_only) - parser_cleanup(); + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + parser_cleanup(parser); if (opts_output_free) - mem_d((char*)opts.output); + mem_d(OPTS_OPTION_STR(OPTION_OUTPUT)); if (operators_free) mem_d((void*)operators);