X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=bbc685a05fdb69bb2b8e7d31071e7d620468df58;hp=5849b53528e3a509f4c8fd8024d966a483c8fc11;hb=219508e478ab0e9bf0b99799c71925a4a4d49ed7;hpb=d201cfe6b49f95ba8bcaa0eebb3a6fb7e1a16913 diff --git a/main.c b/main.c index 5849b53..bbc685a 100644 --- a/main.c +++ b/main.c @@ -44,18 +44,13 @@ 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, __DATE__, __TIME__ ); -#ifdef GMQCC_GITINFO - con_out("git build: %s\n", GMQCC_GITINFO); -#elif defined(GMQCC_VERION_TYPE_DEVEL) - con_out("development build\n"); -#endif } static int usage() { @@ -146,9 +141,10 @@ static bool options_parse(int argc, char **argv) { bool argend = false; size_t itr; char buffer[1024]; - char *redirout = NULL; - char *redirerr = NULL; - char *config = NULL; + char *redirout = NULL; + char *redirerr = NULL; + char *config = NULL; + char *memdumpcols = NULL; while (!argend && argc > 1) { char *argarg; @@ -172,16 +168,17 @@ 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_set(opts.flags, EXPRESSIONS_FOR_BUILTINS, 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 +189,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 +204,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)) { @@ -223,6 +220,10 @@ 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")) { @@ -248,19 +249,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 +281,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': @@ -318,7 +319,7 @@ static bool options_parse(int argc, char **argv) { 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%s\n\n", buffer, opts_flag_list[itr].description); + con_out(" -f%s\n", buffer); } exit(0); } @@ -339,7 +340,9 @@ static bool options_parse(int argc, char **argv) { con_out("Possible warnings:\n"); for (itr = 0; itr < COUNT_WARNINGS; ++itr) { util_strtononcmd(opts_warn_list[itr].name, buffer, sizeof(buffer)); - con_out(" -W%s:\n%s\n\n\n", buffer, opts_warn_list[itr].description); + con_out(" -W%s\n", buffer); + if (itr == WARN_DEBUG) + con_out(" Warnings included by -Wall:\n"); } exit(0); } @@ -401,8 +404,8 @@ static bool options_parse(int argc, char **argv) { return false; } if (isdigit(argarg[0])) { - uint32_t val = atoi(argarg); - OPTION_VALUE_U32(OPTION_O) = val; + 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); @@ -410,12 +413,12 @@ static bool options_parse(int argc, char **argv) { con_out("Possible optimizations:\n"); for (itr = 0; itr < COUNT_OPTIMIZATIONS; ++itr) { util_strtononcmd(opts_opt_list[itr].name, buffer, sizeof(buffer)); - con_out(" -O%-20s (-O%u):\n%s\n\n", buffer, opts_opt_oflag[itr], opts_opt_list[itr].description); + con_out(" -O%-20s (-O%u)\n", buffer, opts_opt_oflag[itr]); } 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 +439,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 +471,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]); @@ -520,7 +523,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; @@ -539,12 +542,14 @@ 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 (); @@ -562,10 +567,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 +598,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 = fs_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,31 +623,28 @@ int main(int argc, char **argv) { } } - if (!OPTION_VALUE_BOOL(OPTION_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 (OPTION_VALUE_BOOL(OPTION_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; } } - if (OPTS_FLAG(TRUE_EMPTY_STRINGS)) - type_not_instr[TYPE_STRING] = INSTR_NOT_F; - 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); + ftepp_add_macro(ftepp, ppems[itr].name, ppems[itr].value); mem_d(ppems[itr].name); /* can be null */ @@ -658,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; @@ -673,7 +675,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; } @@ -687,7 +689,7 @@ int main(int argc, char **argv) { } srcdone: - file_close(src); + fs_file_close(src); mem_d(line); } @@ -695,15 +697,16 @@ 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,35 +716,35 @@ 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)) { + if (!ftepp_preprocess_file(ftepp, items[itr].filename)) { retval = 1; goto cleanup; } - out = ftepp_get(); + out = ftepp_get(ftepp); if (out) - file_printf(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(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; } @@ -754,9 +757,10 @@ srcdone: } } - ftepp_finish(); - if (!OPTION_VALUE_BOOL(OPTION_PP_ONLY)) { - if (!parser_finish(OPTION_VALUE_STR(OPTION_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; } @@ -764,8 +768,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]) { @@ -776,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 (!OPTION_VALUE_BOOL(OPTION_PP_ONLY)) - parser_cleanup(); + if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) + parser_cleanup(parser); 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);