X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=main.c;h=2450e6a63ae8ac67bd1c0a5f50a51132857f87e1;hp=dee9a3293b0bc6765c81ef485265214accc0ce7a;hb=b654594adbbf4422bfd8ded8e2d133f455e59377;hpb=36c5722273f1ea87603621c6ee20b7178a7a641b diff --git a/main.c b/main.c index dee9a32..2450e6a 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 */ @@ -43,22 +47,17 @@ static ppitem *ppems = NULL; static const char *app_name; -static void version() { - con_out("GMQCC %d.%d.%d Built %s %s\n", +static void version(void) { + 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() { +static int usage(void) { con_out("usage: %s [options] [files...]", app_name); con_out("options:\n" " -h, --help show this help message\n" @@ -146,9 +145,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,6 +172,8 @@ 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); + opts_set(opts.warn, WARN_BREAKDEF, true); OPTS_OPTION_U32(OPTION_STANDARD) = COMPILER_GMQCC; @@ -191,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; @@ -223,6 +226,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")) { @@ -318,7 +325,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 +346,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); } @@ -400,8 +409,8 @@ 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])) { - uint32_t val = atoi(argarg); + if (util_isdigit(argarg[0])) { + uint32_t val = (uint32_t)strtol(argarg, NULL, 10); OPTS_OPTION_U32(OPTION_O) = val; opts_setoptimlevel(val); } else { @@ -410,7 +419,7 @@ 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); } @@ -520,14 +529,14 @@ 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; /* 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 */ @@ -539,16 +548,18 @@ 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)); + opts_init("progs.dat", COMPILER_QCC, (1024 << 3)); util_seed(time(0)); @@ -606,7 +617,7 @@ int main(int argc, char **argv) { if (OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { if (opts_output_wasset) { - outfile = file_open(OPTS_OPTION_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", OPTS_OPTION_STR(OPTION_OUTPUT)); retval = 1; @@ -619,7 +630,7 @@ int main(int argc, char **argv) { } if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { - if (!parser_init()) { + if (!(parser = parser_create())) { con_err("failed to initialize parser\n"); retval = 1; goto cleanup; @@ -627,22 +638,19 @@ int main(int argc, char **argv) { } if (OPTS_OPTION_BOOL(OPTION_PP_ONLY) || OPTS_FLAG(FTEPP)) { - if (!ftepp_init()) { + 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 (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 */ @@ -652,48 +660,41 @@ 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; - 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; 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: - file_close(src); + 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)) @@ -701,6 +702,7 @@ srcdone: 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_OPTION_BOOL(OPTION_QUIET) && !OPTS_OPTION_BOOL(OPTION_PP_ONLY)) @@ -715,33 +717,33 @@ srcdone: 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 +756,10 @@ srcdone: } } - ftepp_finish(); + ftepp_finish(ftepp); + ftepp = NULL; if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) { - if (!parser_finish(OPTS_OPTION_STR(OPTION_OUTPUT))) { + if (!parser_finish(parser, OPTS_OPTION_STR(OPTION_OUTPUT))) { retval = 1; goto cleanup; } @@ -776,19 +779,21 @@ srcdone: cleanup: util_debug("COM", "cleaning ...\n"); - ftepp_finish(); + if (ftepp) + ftepp_finish(ftepp); con_close(); vec_free(items); vec_free(ppems); if (!OPTS_OPTION_BOOL(OPTION_PP_ONLY)) - parser_cleanup(); + 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; }