#include "gmqcc.h"
#include "lexer.h"
-#include <time.h>
-
uint32_t opts_flags[1 + (COUNT_FLAGS / 32)];
uint32_t opts_warn [1 + (COUNT_WARNINGS / 32)];
bool opts_dump = false;
bool opts_werror = false;
bool opts_forcecrc = false;
-bool opts_benchmark = false;
+bool opts_pp_only = false;
+size_t opts_max_array_size = 1024;
uint16_t opts_forced_crc;
printf(" -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(" -E stop after preprocessing\n");
printf(" -f<flag> enable a flag\n"
" -fno-<flag> disable a flag\n"
" -std standard select one of the following standards\n"
" -std=gmqcc this compiler (default)\n");
printf(" -W<warning> enable a warning\n"
" -Wno-<warning> 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;
}
return options_long_witharg_all(optname, argc_, argv_, out, 1, false);
}
+static void options_set(uint32_t *flags, size_t idx, bool on)
+{
+ longbit lb = LONGBIT(idx);
+#if 0
+ if (on)
+ flags[lb.idx] |= (1<<(lb.bit));
+ else
+ flags[lb.idx] &= ~(1<<(lb.bit));
+#else
+ if (on)
+ flags[0] |= (1<<(lb));
+ else
+ flags[0] &= ~(1<<(lb));
+#endif
+}
+
static bool options_parse(int argc, char **argv) {
bool argend = false;
size_t itr;
if (argv[0][0] == '-') {
/* All gcc-type long options */
if (options_long_gcc("std", &argc, &argv, &argarg)) {
- if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default"))
+ if (!strcmp(argarg, "gmqcc") || !strcmp(argarg, "default")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, true);
opts_standard = COMPILER_GMQCC;
- else if (!strcmp(argarg, "qcc"))
+ } 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"))
+ } 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"))
+ } else if (!strcmp(argarg, "qccx")) {
+ options_set(opts_flags, ADJUST_VECTOR_FIELDS, false);
opts_standard = COMPILER_QCCX;
- else {
+ } else {
printf("Unknown standard: %s\n", argarg);
return false;
}
opts_memchk = true;
continue;
}
- if (!strcmp(argv[0]+1, "benchmark")) {
- opts_benchmark = true;
- continue;
- }
switch (argv[0][1]) {
/* -h, show usage but exit with 0 */
exit(0);
break;
+ case 'E':
+ opts_pp_only = true;
+ break;
+
/* handle all -fflags */
case 'f':
util_strtocmd(argv[0]+2, argv[0]+2, strlen(argv[0]+2)+1);
return true;
}
-static void options_set(uint32_t *flags, size_t idx, bool on)
-{
- longbit lb = LONGBIT(idx);
-#if 0
- if (on)
- flags[lb.idx] |= (1<<(lb.bit));
- else
- flags[lb.idx] &= ~(1<<(lb.bit));
-#else
- if (on)
- flags[0] |= (1<<(lb));
- else
- flags[0] &= ~(1<<(lb));
-#endif
-}
-
/* returns the line number, or -1 on error */
static bool progs_nextline(char **out, size_t *alen,FILE *src)
{
int retval = 0;
bool opts_output_free = false;
- struct timespec ta, tb, tc;
-
app_name = argv[0];
/* default options / warn flags */
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();
if (items_elements) {
printf("Mode: manual\n");
printf("There are %lu items to compile:\n", (unsigned long)items_elements);
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &ta);
for (itr = 0; itr < items_elements; ++itr) {
printf(" item: %s (%s)\n",
items_data[itr].filename,
}
}
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &tb);
- parser_finish(opts_output);
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &tc);
+ if (!parser_finish(opts_output)) {
+ retval = 1;
+ goto cleanup;
+ }
} else {
FILE *src;
opts_output_free = true;
}
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &ta);
while (progs_nextline(&line, &linelen, src)) {
if (!line[0] || (line[0] == '/' && line[1] == '/'))
continue;
}
}
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &tb);
parser_finish(opts_output);
- if (opts_benchmark)
- clock_gettime(CLOCK_MONOTONIC, &tc);
srcdone:
fclose(src);
mem_d(line);
}
- if (opts_benchmark)
- {
- printf("started parsing at: %lu:%09lu\n", (unsigned long)ta.tv_sec, (unsigned long)ta.tv_nsec);
- printf("started codegen at: %lu:%09lu\n", (unsigned long)tb.tv_sec, (unsigned long)tb.tv_nsec);
- printf(" finished at: %lu:%09lu\n", (unsigned long)tc.tv_sec, (unsigned long)tc.tv_nsec);
- {
- size_t sec = tb.tv_sec - ta.tv_sec;
- size_t nsec = (tb.tv_nsec + sec * 1000000000L) - ta.tv_nsec;
- printf("Parsing took %lu\n", (unsigned long)nsec);
- }
- {
- size_t sec = tc.tv_sec - tb.tv_sec;
- size_t nsec = (tc.tv_nsec + sec * 1000000000L) - tb.tv_nsec;
- printf("Codegen took %lu\n", (unsigned long)nsec);
- }
- }
/* stuff */