X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=48ff96e237c644b24f430cf5b3d9ee69f9de12e1;hb=7df42c95d2b0b7cbe2d61173ac24cce78ff87476;hp=ce3025ac10a0052740e03460cca7f3ff58eafe30;hpb=daa1487aefbb31359c532a19e01819f0d00f6716;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index ce3025a..48ff96e 100644 --- a/main.c +++ b/main.c @@ -25,8 +25,6 @@ #include #include #include -#include - #include "gmqcc.h" #include "lexer.h" @@ -47,7 +45,6 @@ static ppitem *ppems = NULL; #define TYPE_ASM 1 #define TYPE_SRC 2 - static const char *app_name; static void version(void) { @@ -74,7 +71,6 @@ static int usage(void) { con_out(" -std=standard select one of the following standards\n" " -std=qcc original QuakeC\n" " -std=fteqcc fteqcc QuakeC\n" - " -std=hcode hexgen2 QuakeC\n" " -std=gmqcc this compiler (default)\n"); con_out(" -f enable a flag\n" " -fno- disable a flag\n" @@ -177,10 +173,10 @@ static bool options_parse(int argc, char **argv) { 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_set(opts.warn, WARN_BREAKDEF, true); OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC; - OPTS_OPTION_BOOL(OPTION_STATISTICS) = true; } else if (!strcmp(argarg, "qcc")) { @@ -197,6 +193,7 @@ 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_set(opts.warn, WARN_BREAKDEF, true); OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_FTEQCC; @@ -205,12 +202,6 @@ static bool options_parse(int argc, char **argv) { opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_QCCX; - } else if (!strcmp(argarg, "hcode")) { - - opts_set(opts.flags, ADJUST_VECTOR_FIELDS, false); - opts_set(opts.flags, ASSIGN_FUNCTION_TYPES, true); - - OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_HCODE; } else { con_out("Unknown standard: %s\n", argarg); return false; @@ -418,7 +409,7 @@ static bool options_parse(int argc, char **argv) { con_out("option -O requires a numerical argument, or optimization name with an optional 'no-' prefix\n"); return false; } - if (isdigit(argarg[0])) { + if (util_isdigit(argarg[0])) { uint32_t val = (uint32_t)strtol(argarg, NULL, 10); OPTS_OPTION_U32(OPTION_O) = val; opts_setoptimlevel(val); @@ -435,7 +426,8 @@ static bool options_parse(int argc, char **argv) { else if (!strcmp(argarg, "ALL")) opts_setoptimlevel(OPTS_OPTION_U32(OPTION_O) = 9999); else if (!strncmp(argarg, "NO_", 3)) { - if (!opts_setoptim(argarg+3, false)) { + /* constant folding cannot be turned off for obvious reasons */ + if (!strcmp(argarg, "NO_CONST_FOLD") || !opts_setoptim(argarg+3, false)) { con_out("unknown optimization: %s\n", argarg+3); return false; } @@ -543,9 +535,9 @@ static bool progs_nextline(char **out, size_t *alen,FILE *src) { return false; /* start at first non-blank */ - for (start = line; isspace(*start); ++start) {} + for (start = line; util_isspace(*start); ++start) {} /* end at the first non-blank */ - for (end = start; *end && !isspace(*end); ++end) {} + for (end = start; *end && !util_isspace(*end); ++end) {} *out = line; /* move the actual filename to the beginning */ @@ -568,7 +560,7 @@ int main(int argc, char **argv) { app_name = argv[0]; con_init (); - opts_init("progs.dat", COMPILER_GMQCC, (1024 << 3)); + opts_init("progs.dat", COMPILER_QCC, (1024 << 3)); util_seed(time(0)); @@ -669,9 +661,10 @@ int main(int argc, char **argv) { } if (!vec_size(items)) { - FILE *src; - char *line; + FILE *src; + char *line = NULL; size_t linelen = 0; + bool hasline = false; progs_src = true; @@ -682,35 +675,27 @@ int main(int argc, char **argv) { goto cleanup; } - line = NULL; - if (!progs_nextline(&line, &linelen, src) || !line[0]) { - con_err("illformatted progs.src file: expected output filename in first line\n"); - retval = 1; - goto srcdone; - } - - if (!opts_output_wasset) { - OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line); - opts_output_free = true; - } - while (progs_nextline(&line, &linelen, src)) { argitem item; + if (!line[0] || (line[0] == '/' && line[1] == '/')) continue; - item.filename = util_strdup(line); - item.type = TYPE_QC; - vec_push(items, item); + + if (hasline) { + item.filename = util_strdup(line); + item.type = TYPE_QC; + vec_push(items, item); + } else if (!opts_output_wasset) { + OPTS_OPTION_STR(OPTION_OUTPUT) = util_strdup(line); + opts_output_free = true; + hasline = true; + } } -srcdone: fs_file_close(src); mem_d(line); } - if (retval) - goto cleanup; - if (vec_size(items)) { if (!OPTS_OPTION_BOOL(OPTION_QUIET) && !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) @@ -782,17 +767,6 @@ srcdone: } } - /* stuff */ - 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]); - } - } - } - cleanup: util_debug("COM", "cleaning ...\n"); if (ftepp) @@ -802,7 +776,7 @@ cleanup: vec_free(ppems); if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) - parser_cleanup(parser); + if(parser) parser_cleanup(parser); if (opts_output_free) mem_d(OPTS_OPTION_STR(OPTION_OUTPUT)); if (operators_free)