X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=main.c;h=0ea96c447a710a939e2f6a33bac4a893f1f9a43c;hb=ab86b0470c229e85ec45126ee716c0699c2a3725;hp=bef80723632b9176167b9cf3d4ee939aecca124e;hpb=067294a470beb5479c97a3ac9e5147691e6013a8;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index bef8072..0ea96c4 100644 --- a/main.c +++ b/main.c @@ -21,6 +21,7 @@ * SOFTWARE. */ #include "gmqcc.h" +#include "lexer.h" uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)]; @@ -30,6 +31,17 @@ const char *opts_output = "progs.dat"; int opts_standard = COMPILER_GMQCC; bool opts_debug = false; bool opts_memchk = false; +bool opts_dump = false; +bool opts_werror = false; +bool opts_forcecrc = false; + +uint16_t opts_forced_crc; + +static bool opts_output_wasset = false; + +/* set by the standard */ +const oper_info *operators = NULL; +size_t operator_count = 0; typedef struct { char *filename; int type; } argitem; VECTOR_MAKE(argitem, items); @@ -57,13 +69,13 @@ static int usage() { " -std=gmqcc this compiler (default)\n"); printf(" -W enable a warning\n" " -Wno- disable a warning\n" - " -Wall enable all warnings\n"); + " -Wall enable all warnings\n" + " -Werror treat warnings as errors\n"); + printf(" -force-crc=num force a specific checksum into the header\n"); printf("\n"); printf("flags:\n" - " -fdarkplaces-string-table-bug\n" - " patch the string table to work with some bugged darkplaces versions\n" - " -fomit-nullbytes\n" - " omits certain null-bytes for a smaller output - requires a patched engine\n" + " -fadjust-vector-fields\n" + " when assigning a vector field, its _y and _z fields also get assigned\n" ); return -1; } @@ -175,10 +187,19 @@ 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); + continue; + } if (!strcmp(argv[0]+1, "debug")) { opts_debug = true; continue; } + if (!strcmp(argv[0]+1, "dump")) { + opts_dump = true; + continue; + } if (!strcmp(argv[0]+1, "memchk")) { opts_memchk = true; continue; @@ -223,6 +244,19 @@ static bool options_parse(int argc, char **argv) { } exit(0); } + else if (!strcmp(argv[0]+2, "NO_ERROR")) { + opts_werror = false; + break; + } + else if (!strcmp(argv[0]+2, "ERROR")) { + opts_werror = true; + break; + } + else if (!strcmp(argv[0]+2, "NONE")) { + for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr) + opts_warn[itr] = 0; + break; + } else if (!strcmp(argv[0]+2, "ALL")) { for (itr = 0; itr < sizeof(opts_warn)/sizeof(opts_warn[0]); ++itr) opts_warn[itr] = 0xFFFFFFFFL; @@ -254,6 +288,7 @@ static bool options_parse(int argc, char **argv) { return false; } opts_output = argarg; + opts_output_wasset = true; break; case 'a': @@ -281,10 +316,10 @@ static bool options_parse(int argc, char **argv) { } else { /* All long options with arguments */ - if (options_long_witharg("output", &argc, &argv, &argarg)) + if (options_long_witharg("output", &argc, &argv, &argarg)) { opts_output = argarg; - else - { + opts_output_wasset = true; + } else { printf("Unknown parameter: %s\n", argv[0]); return false; } @@ -324,34 +359,85 @@ static void options_set(uint32_t *flags, size_t idx, bool on) #endif } -bool parser_init(); -bool parser_compile(const char *filename); -bool parser_finish(const char *output); -void parser_cleanup(); +/* returns the line number, or -1 on error */ +static bool progs_nextline(char **out, size_t *alen,FILE *src) +{ + int len; + char *line; + char *start; + char *end; + + line = *out; + len = util_getline(&line, alen, src); + if (len == -1) + return false; + + /* start at first non-blank */ + for (start = line; isspace(*start); ++start) {} + /* end at the first non-blank */ + for (end = start; *end && !isspace(*end); ++end) {} + + *out = line; + /* move the actual filename to the beginning */ + while (start != end) { + *line++ = *start++; + } + *line = 0; + return true; +} int main(int argc, char **argv) { size_t itr; + int retval = 0; + bool opts_output_free = false; + app_name = argv[0]; /* default options / warn flags */ options_set(opts_warn, WARN_UNKNOWN_CONTROL_SEQUENCE, true); + options_set(opts_warn, WARN_EXTENSIONS, true); + options_set(opts_warn, WARN_FIELD_REDECLARED, true); + options_set(opts_warn, WARN_TOO_FEW_PARAMETERS, true); + options_set(opts_warn, WARN_MISSING_RETURN_VALUES, true); + options_set(opts_warn, WARN_USED_UNINITIALIZED, true); + options_set(opts_warn, WARN_LOCAL_CONSTANTS, true); + options_set(opts_warn, WARN_VOID_VARIABLES, true); + options_set(opts_warn, WARN_IMPLICIT_FUNCTION_POINTER, true); + options_set(opts_warn, WARN_VARIADIC_FUNCTION, true); + options_set(opts_warn, WARN_FRAME_MACROS, true); + options_set(opts_warn, WARN_UNUSED_VARIABLE, true); + options_set(opts_warn, WARN_EFFECTLESS_STATEMENT, true); + options_set(opts_warn, WARN_END_SYS_FIELDS, true); + options_set(opts_warn, WARN_ASSIGN_FUNCTION_TYPES, true); if (!options_parse(argc, argv)) { return usage(); } - for (itr = 0; itr < COUNT_FLAGS; ++itr) { - printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); + /* the standard decides which set of operators to use */ + if (opts_standard == COMPILER_GMQCC) { + operators = c_operators; + operator_count = c_operator_count; + } else { + operators = qcc_operators; + operator_count = qcc_operator_count; } - for (itr = 0; itr < COUNT_WARNINGS; ++itr) { - printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); + + if (opts_dump) { + for (itr = 0; itr < COUNT_FLAGS; ++itr) { + printf("Flag %s = %i\n", opts_flag_list[itr].name, OPTS_FLAG(itr)); + } + for (itr = 0; itr < COUNT_WARNINGS; ++itr) { + printf("Warning %s = %i\n", opts_warn_list[itr].name, OPTS_WARN(itr)); + } + printf("output = %s\n", opts_output); + printf("optimization level = %i\n", (int)opts_O); + printf("standard = %i\n", opts_standard); } - printf("output = %s\n", opts_output); - printf("optimization level = %i\n", (int)opts_O); - printf("standard = %i\n", opts_standard); if (!parser_init()) { printf("failed to initialize parser\n"); + retval = 1; goto cleanup; } @@ -368,13 +454,57 @@ int main(int argc, char **argv) { (items_data[itr].type == TYPE_SRC ? "progs.src" : ("unknown")))))); - if (!parser_compile(items_data[itr].filename)) + if (!parser_compile(items_data[itr].filename)) { + retval = 1; goto cleanup; + } + } + + if (!parser_finish(opts_output)) { + retval = 1; + goto cleanup; } - parser_finish(opts_output); } else { - printf("Mode: progs.src - not implemented\n"); + FILE *src; + char *line; + size_t linelen = 0; + + printf("Mode: progs.src\n"); + src = util_fopen("progs.src", "rb"); + if (!src) { + printf("failed to open `progs.src` for reading\n"); + retval = 1; + goto cleanup; + } + + line = NULL; + if (!progs_nextline(&line, &linelen, src) || !line[0]) { + printf("illformatted progs.src file: expected output filename in first line\n"); + retval = 1; + goto srcdone; + } + + if (!opts_output_wasset) { + opts_output = util_strdup(line); + opts_output_free = true; + } + + while (progs_nextline(&line, &linelen, src)) { + if (!line[0] || (line[0] == '/' && line[1] == '/')) + continue; + printf(" src: %s\n", line); + if (!parser_compile(line)) { + retval = 1; + goto srcdone; + } + } + + parser_finish(opts_output); + +srcdone: + fclose(src); + mem_d(line); } /* stuff */ @@ -382,8 +512,13 @@ int main(int argc, char **argv) { cleanup: util_debug("COM", "cleaning ...\n"); + mem_d(items_data); + parser_cleanup(); + if (opts_output_free) + mem_d((char*)opts_output); + lex_cleanup(); util_meminfo(); - return 0; + return retval; }