X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=652ee616c9e3d0faa6e0d2877ab46cd268d81789;hb=e50b7a27191372a333f5c9f3ffbbfaab9fb85522;hp=4eb5eb31f29a556b09c788c183141e1577707af2;hpb=121e0806979160e9236cd6cc6173fe76db3f2349;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index 4eb5eb3..652ee61 100644 --- a/main.c +++ b/main.c @@ -21,9 +21,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ +#include +#include +#include +#include + #include "gmqcc.h" #include "lexer.h" -#include /* TODO: cleanup this whole file .. it's a fuckign mess */ @@ -41,10 +45,9 @@ static ppitem *ppems = NULL; #define TYPE_ASM 1 #define TYPE_SRC 2 - static const char *app_name; -static void version() { +static void version(void) { con_out("GMQCC %d.%d.%d Built %s %s\n" GMQCC_DEV_VERSION_STRING, GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, @@ -54,7 +57,7 @@ static void version() { ); } -static int usage() { +static int usage(void) { con_out("usage: %s [options] [files...]", app_name); con_out("options:\n" " -h, --help show this help message\n" @@ -170,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")) { @@ -190,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; @@ -351,7 +355,7 @@ static bool options_parse(int argc, char **argv) { else if (!strcmp(argv[0]+2, "NO_ERROR") || !strcmp(argv[0]+2, "NO_ERROR_ALL")) { - for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr) + for (itr = 0; itr < GMQCC_ARRAY_COUNT(opts.werror); ++itr) opts.werror[itr] = 0; break; } @@ -359,19 +363,19 @@ static bool options_parse(int argc, char **argv) { !strcmp(argv[0]+2, "ERROR_ALL")) { opts_backup_non_Werror_all(); - for (itr = 0; itr < sizeof(opts.werror)/sizeof(opts.werror[0]); ++itr) + for (itr = 0; itr < GMQCC_ARRAY_COUNT(opts.werror); ++itr) opts.werror[itr] = 0xFFFFFFFFL; opts_restore_non_Werror_all(); break; } else if (!strcmp(argv[0]+2, "NONE")) { - for (itr = 0; itr < sizeof(opts.warn)/sizeof(opts.warn[0]); ++itr) + for (itr = 0; itr < GMQCC_ARRAY_COUNT(opts.warn); ++itr) opts.warn[itr] = 0; break; } else if (!strcmp(argv[0]+2, "ALL")) { opts_backup_non_Wall(); - for (itr = 0; itr < sizeof(opts.warn)/sizeof(opts.warn[0]); ++itr) + for (itr = 0; itr < GMQCC_ARRAY_COUNT(opts.warn); ++itr) opts.warn[itr] = 0xFFFFFFFFL; opts_restore_non_Wall(); break; @@ -405,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); @@ -422,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; } @@ -530,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 */ @@ -555,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)); @@ -571,13 +576,13 @@ int main(int argc, char **argv) { /* the standard decides which set of operators to use */ if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_GMQCC) { operators = c_operators; - operator_count = c_operator_count; + operator_count = GMQCC_ARRAY_COUNT(c_operators); } else if (OPTS_OPTION_U32(OPTION_STANDARD) == COMPILER_FTEQCC) { operators = fte_operators; - operator_count = fte_operator_count; + operator_count = GMQCC_ARRAY_COUNT(fte_operators); } else { operators = qcc_operators; - operator_count = qcc_operator_count; + operator_count = GMQCC_ARRAY_COUNT(qcc_operators); } if (operators == fte_operators) { @@ -656,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; @@ -669,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)) @@ -769,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) @@ -789,13 +776,14 @@ 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) mem_d((void*)operators); lex_cleanup(); - util_meminfo(); + stat_info(); + return retval; }