X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=main.c;h=c634fd01a0d56f27df43e374392bdce0ee25efaa;hb=2e84cc0b418500a57d95315c0376c13a10d60142;hp=8b30cfef6b1fd2d7bb3cfbe49d56b16d8c81a23b;hpb=d06cc6c2d1620bdf234121b43a29bc72642cd583;p=xonotic%2Fgmqcc.git diff --git a/main.c b/main.c index 8b30cfe..c634fd0 100644 --- a/main.c +++ b/main.c @@ -21,12 +21,29 @@ * SOFTWARE. */ #include "gmqcc.h" +#include "lexer.h" -uint32_t opt_flags[1 + (NUM_F_FLAGS / 32)]; +uint32_t opts_flags[1 + (COUNT_FLAGS / 32)]; +uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)]; -uint32_t opt_O = 1; -const char *opt_output = "progs.dat"; -int opt_standard = STD_DEF; +uint32_t opts_O = 1; +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; +bool opts_pp_only = false; +size_t opts_max_array_size = 1024; + +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); @@ -38,50 +55,62 @@ VECTOR_MAKE(argitem, items); static const char *app_name; static int usage() { - printf("usage: %s [options] [files...]", app_name); - printf("options:\n" + con_out("usage: %s [options] [files...]", app_name); + con_out("options:\n" " -h, --help show this help message\n" - " -o, --output=file output file, defaults to progs.dat\n" + " -debug turns on compiler debug messages\n" + " -memchk turns on compiler memory leak check\n"); + con_out(" -o, --output=file output file, defaults to progs.dat\n" " -a filename add an asm file to be assembled\n" " -s filename add a progs.src file to be used\n"); - printf(" -fflag enable a flag\n" - " -fno-flag disable a flag\n" + con_out(" -E stop after preprocessing\n"); + con_out(" -f enable a flag\n" + " -fno- disable a flag\n" " -std standard select one of the following standards\n" " -std=qcc original QuakeC\n" " -std=fteqcc fteqcc QuakeC\n" " -std=gmqcc this compiler (default)\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" + con_out(" -W enable a warning\n" + " -Wno- disable a warning\n" + " -Wall enable all warnings\n" + " -Werror treat warnings as errors\n"); + con_out(" -force-crc=num force a specific checksum into the header\n"); + con_out("\n"); + con_out("flags:\n" + " -fadjust-vector-fields\n" + " when assigning a vector field, its _y and _z fields also get assigned\n" ); return -1; } -static bool options_setflag(const char *name, bool on) { +static bool options_setflag_all(const char *name, bool on, uint32_t *flags, const opts_flag_def *list, size_t listsize) { size_t i; - for (i = 0; i < opt_flag_list_count; ++i) { - if (!strcmp(name, opt_flag_list[i].name)) { - longbit lb = opt_flag_list[i].bit; + for (i = 0; i < listsize; ++i) { + if (!strcmp(name, list[i].name)) { + longbit lb = list[i].bit; #if 0 if (on) - opt_flags[lb.idx] |= (1<<(lb.bit)); + flags[lb.idx] |= (1<<(lb.bit)); else - opt_flags[lb.idx] &= ~(1<<(lb.bit)); + flags[lb.idx] &= ~(1<<(lb.bit)); #else if (on) - opt_flags[0] |= (1< 1) { char *argarg; argitem item; @@ -145,18 +192,41 @@ static bool options_parse(int argc, char **argv) { if (argv[0][0] == '-') { /* All gcc-type long options */ if (options_long_gcc("std", &argc, &argv, &argarg)) { - if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) - opt_standard = STD_DEF; - else if (!strcmp(argarg, "qcc")) - opt_standard = STD_QCC; - else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) - opt_standard = STD_FTE; - else { - printf("Unknown standard: %s\n", argarg); + if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, true); + opts_standard = COMPILER_GMQCC; + } else if (!strcmp(argarg, "qcc")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); + opts_standard = COMPILER_QCC; + } else if (!strcmp(argarg, "fte") || !strcmp(argarg, "fteqcc")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); + opts_standard = COMPILER_FTEQCC; + } else if (!strcmp(argarg, "qccx")) { + options_set(opts_flags, ADJUST_VECTOR_FIELDS, false); + opts_standard = COMPILER_QCCX; + } else { + con_out("Unknown standard: %s\n", argarg); return false; } 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; + } switch (argv[0][1]) { /* -h, show usage but exit with 0 */ @@ -165,41 +235,94 @@ static bool options_parse(int argc, char **argv) { exit(0); break; + case 'E': + opts_pp_only = true; + break; + /* handle all -fflags */ case 'f': - if (!strncmp(argv[0]+2, "no-", 3)) { + util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); + if (!strcmp(argv[0]+2, "HELP")) { + con_out("Possible flags:\n"); + for (itr = 0; itr < COUNT_FLAGS; ++itr) { + util_strtononcmd(opts_flag_list[itr].name, buffer, sizeof(buffer)); + con_out(" -f%s\n", buffer); + } + exit(0); + } + else if (!strncmp(argv[0]+2, "NO_", 3)) { if (!options_setflag(argv[0]+5, false)) { - printf("unknown flag: %s\n", argv[0]+2); + con_out("unknown flag: %s\n", argv[0]+2); return false; } } else if (!options_setflag(argv[0]+2, true)) { - printf("unknown flag: %s\n", argv[0]+2); + con_out("unknown flag: %s\n", argv[0]+2); + return false; + } + break; + case 'W': + util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1); + if (!strcmp(argv[0]+2, "HELP")) { + 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", buffer); + } + 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; + break; + } + if (!strncmp(argv[0]+2, "NO_", 3)) { + if (!options_setwarn(argv[0]+5, false)) { + con_out("unknown warning: %s\n", argv[0]+2); + return false; + } + } + else if (!options_setwarn(argv[0]+2, true)) { + con_out("unknown warning: %s\n", argv[0]+2); return false; } break; case 'O': if (!options_witharg(&argc, &argv, &argarg)) { - printf("option -O requires a numerical argument\n"); + con_out("option -O requires a numerical argument\n"); return false; } - opt_O = atoi(argarg); + opts_O = atoi(argarg); break; case 'o': if (!options_witharg(&argc, &argv, &argarg)) { - printf("option -o requires an argument: the output file name\n"); + con_out("option -o requires an argument: the output file name\n"); return false; } - opt_output = argarg; + opts_output = argarg; + opts_output_wasset = true; break; case 'a': case 's': item.type = argv[0][1] == 'a' ? TYPE_ASM : TYPE_SRC; if (!options_witharg(&argc, &argv, &argarg)) { - printf("option -a requires a filename %s\n", + con_out("option -a requires a filename %s\n", (argv[0][1] == 'a' ? "containing QC-asm" : "containing a progs.src formatted list")); return false; } @@ -220,18 +343,18 @@ static bool options_parse(int argc, char **argv) { } else { /* All long options with arguments */ - if (options_long_witharg("output", &argc, &argv, &argarg)) - opt_output = argarg; - else - { - printf("Unknown parameter: %s\n", argv[0]); + if (options_long_witharg("output", &argc, &argv, &argarg)) { + opts_output = argarg; + opts_output_wasset = true; + } else { + con_out("Unknown parameter: %s\n", argv[0]); return false; } } break; default: - printf("Unknown parameter: %s\n", argv[0]); + con_out("Unknown parameter: %s\n", argv[0]); return false; } } @@ -247,42 +370,170 @@ static bool options_parse(int argc, char **argv) { return true; } +/* 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]; + con_init(); + + /* 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); + + options_set(opts_flags, ADJUST_VECTOR_FIELDS, true); if (!options_parse(argc, argv)) { return usage(); } - for (itr = 0; itr < opt_flag_list_count; ++itr) { - printf("Flag %s = %i\n", opt_flag_list[itr].name, OPT_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; + } + + if (opts_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", opts_output); + con_out("optimization level = %i\n", (int)opts_O); + con_out("standard = %i\n", opts_standard); + } + + if (!parser_init()) { + con_out("failed to initialize parser\n"); + retval = 1; + goto cleanup; } - printf("output = %s\n", opt_output); - printf("optimization level = %i\n", (int)opt_O); - printf("standard = %i\n", opt_standard); + + util_debug("COM", "starting ...\n"); if (items_elements) { - printf("Mode: manual\n"); - printf("There are %lu items to compile:\n", (unsigned long)items_elements); + con_out("Mode: manual\n"); + con_out("There are %lu items to compile:\n", (unsigned long)items_elements); for (itr = 0; itr < items_elements; ++itr) { - printf(" item: %s (%s)\n", + con_out(" item: %s (%s)\n", items_data[itr].filename, ( (items_data[itr].type == TYPE_QC ? "qc" : (items_data[itr].type == TYPE_ASM ? "asm" : (items_data[itr].type == TYPE_SRC ? "progs.src" : ("unknown")))))); + + if (!parser_compile_file(items_data[itr].filename)) + { + retval = 1; + goto cleanup; + } } + + if (!parser_finish(opts_output)) { + retval = 1; + goto cleanup; + } + } else { - printf("Mode: progs.src\n"); - } + FILE *src; + char *line; + size_t linelen = 0; + + con_out("Mode: progs.src\n"); + src = util_fopen("progs.src", "rb"); + if (!src) { + con_out("failed to open `progs.src` for reading\n"); + retval = 1; + goto cleanup; + } - util_debug("COM", "starting ...\n"); + line = NULL; + if (!progs_nextline(&line, &linelen, src) || !line[0]) { + con_out("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; + con_out(" src: %s\n", line); + if (!parser_compile_file(line)) { + retval = 1; + goto srcdone; + } + } + + parser_finish(opts_output); + +srcdone: + fclose(src); + mem_d(line); + } /* stuff */ +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; }