X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=exec.c;h=455a6c5805555afecc81a392ee17486b1d225958;hp=d5448153072039287445a609555ad11fed39bf84;hb=ff37abb0c7c60481e1264914fa5e02e9986c5cd9;hpb=7fb3b97e73bea933c481944bcfe5395cd311094e diff --git a/exec.c b/exec.c index d544815..455a6c5 100644 --- a/exec.c +++ b/exec.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012, 2013 + * Copyright (C) 2012, 2013, 2014, 2015 * Wolfgang Bumiller * Dale Weiler * @@ -23,9 +23,9 @@ */ #ifndef QCVM_LOOP #include -#include +#include #include -#include +#include #include "gmqcc.h" @@ -36,10 +36,10 @@ static void loaderror(const char *fmt, ...) va_start(ap, fmt); vprintf(fmt, ap); va_end(ap); - printf(": %s\n", strerror(err)); + printf(": %s\n", util_strerror(err)); } -static void qcvmerror(qc_program *prog, const char *fmt, ...) +static void qcvmerror(qc_program_t *prog, const char *fmt, ...) { va_list ap; @@ -51,30 +51,40 @@ static void qcvmerror(qc_program *prog, const char *fmt, ...) putchar('\n'); } -qc_program* prog_load(const char *filename, bool skipversion) +qc_program_t* prog_load(const char *filename, bool skipversion) { - qc_program *prog; - prog_header header; - FILE *file = file_open(filename, "rb"); + prog_header_t header; + qc_program_t *prog; + size_t i; + fs_file_t *file = fs_file_open(filename, "rb"); + + /* we need all those in order to support INSTR_STATE: */ + bool has_self = false, + has_time = false, + has_think = false, + has_nextthink = false, + has_frame = false; if (!file) return NULL; - if (file_read(&header, sizeof(header), 1, file) != 1) { + if (fs_file_read(&header, sizeof(header), 1, file) != 1) { loaderror("failed to read header from '%s'", filename); - file_close(file); + fs_file_close(file); return NULL; } + util_swap_header(&header); + if (!skipversion && header.version != 6) { loaderror("header says this is a version %i progs, we need version 6\n", header.version); - file_close(file); + fs_file_close(file); return NULL; } - prog = (qc_program*)mem_a(sizeof(qc_program)); + prog = (qc_program_t*)mem_a(sizeof(qc_program_t)); if (!prog) { - file_close(file); + fs_file_close(file); fprintf(stderr, "failed to allocate program data\n"); return NULL; } @@ -90,11 +100,11 @@ qc_program* prog_load(const char *filename, bool skipversion) } #define read_data(hdrvar, progvar, reserved) \ - if (file_seek(file, header.hdrvar.offset, SEEK_SET) != 0) { \ + if (fs_file_seek(file, header.hdrvar.offset, SEEK_SET) != 0) { \ loaderror("seek failed"); \ goto error; \ } \ - if (file_read ( \ + if (fs_file_read ( \ vec_add(prog->progvar, header.hdrvar.length + reserved), \ sizeof(*prog->progvar), \ header.hdrvar.length, \ @@ -114,7 +124,13 @@ qc_program* prog_load(const char *filename, bool skipversion) read_data1(strings); read_data2(globals, 2); /* reserve more in case a RETURN using with the global at "the end" exists */ - file_close(file); + util_swap_statements (prog->code); + util_swap_defs_fields(prog->defs); + util_swap_defs_fields(prog->fields); + util_swap_functions (prog->functions); + util_swap_globals (prog->globals); + + fs_file_close(file); /* profile counters */ memset(vec_add(prog->profile, vec_size(prog->code)), 0, sizeof(prog->profile[0]) * vec_size(prog->code)); @@ -129,6 +145,36 @@ qc_program* prog_load(const char *filename, bool skipversion) memset(vec_add(prog->entitydata, prog->entityfields), 0, prog->entityfields * sizeof(prog->entitydata[0])); prog->entities = 1; + /* cache some globals and fields from names */ + for (i = 0; i < vec_size(prog->defs); ++i) { + const char *name = prog_getstring(prog, prog->defs[i].name); + if (!strcmp(name, "self")) { + prog->cached_globals.self = prog->defs[i].offset; + has_self = true; + } + else if (!strcmp(name, "time")) { + prog->cached_globals.time = prog->defs[i].offset; + has_time = true; + } + } + for (i = 0; i < vec_size(prog->fields); ++i) { + const char *name = prog_getstring(prog, prog->fields[i].name); + if (!strcmp(name, "think")) { + prog->cached_fields.think = prog->fields[i].offset; + has_think = true; + } + else if (!strcmp(name, "nextthink")) { + prog->cached_fields.nextthink = prog->fields[i].offset; + has_nextthink = true; + } + else if (!strcmp(name, "frame")) { + prog->cached_fields.frame = prog->fields[i].offset; + has_frame = true; + } + } + if (has_self && has_time && has_think && has_nextthink && has_frame) + prog->supports_state = true; + return prog; error: @@ -143,10 +189,12 @@ error: vec_free(prog->entitydata); vec_free(prog->entitypool); mem_d(prog); + + fs_file_close(file); return NULL; } -void prog_delete(qc_program *prog) +void prog_delete(qc_program_t *prog) { if (prog->filename) mem_d(prog->filename); vec_free(prog->code); @@ -167,16 +215,15 @@ void prog_delete(qc_program *prog) * VM code */ -char* prog_getstring(qc_program *prog, qcint str) -{ +const char* prog_getstring(qc_program_t *prog, qcint_t str) { /* cast for return required for C++ */ - if (str < 0 || str >= (qcint)vec_size(prog->strings)) - return (char*)"<<>>"; + if (str < 0 || str >= (qcint_t)vec_size(prog->strings)) + return "<<>>"; + return prog->strings + str; } -prog_section_def* prog_entfield(qc_program *prog, qcint off) -{ +prog_section_def_t* prog_entfield(qc_program_t *prog, qcint_t off) { size_t i; for (i = 0; i < vec_size(prog->fields); ++i) { if (prog->fields[i].offset == off) @@ -185,7 +232,7 @@ prog_section_def* prog_entfield(qc_program *prog, qcint off) return NULL; } -prog_section_def* prog_getdef(qc_program *prog, qcint off) +prog_section_def_t* prog_getdef(qc_program_t *prog, qcint_t off) { size_t i; for (i = 0; i < vec_size(prog->defs); ++i) { @@ -195,42 +242,39 @@ prog_section_def* prog_getdef(qc_program *prog, qcint off) return NULL; } -qcany* prog_getedict(qc_program *prog, qcint e) -{ - if (e >= (qcint)vec_size(prog->entitypool)) { +qcany_t* prog_getedict(qc_program_t *prog, qcint_t e) { + if (e >= (qcint_t)vec_size(prog->entitypool)) { prog->vmerror++; fprintf(stderr, "Accessing out of bounds edict %i\n", (int)e); e = 0; } - return (qcany*)(prog->entitydata + (prog->entityfields * e)); + return (qcany_t*)(prog->entitydata + (prog->entityfields * e)); } -qcint prog_spawn_entity(qc_program *prog) -{ +static qcint_t prog_spawn_entity(qc_program_t *prog) { char *data; - qcint e; - for (e = 0; e < (qcint)vec_size(prog->entitypool); ++e) { + qcint_t e; + for (e = 0; e < (qcint_t)vec_size(prog->entitypool); ++e) { if (!prog->entitypool[e]) { data = (char*)(prog->entitydata + (prog->entityfields * e)); - memset(data, 0, prog->entityfields * sizeof(qcint)); + memset(data, 0, prog->entityfields * sizeof(qcint_t)); return e; } } vec_push(prog->entitypool, true); prog->entities++; data = (char*)vec_add(prog->entitydata, prog->entityfields); - memset(data, 0, prog->entityfields * sizeof(qcint)); + memset(data, 0, prog->entityfields * sizeof(qcint_t)); return e; } -void prog_free_entity(qc_program *prog, qcint e) -{ +static void prog_free_entity(qc_program_t *prog, qcint_t e) { if (!e) { prog->vmerror++; fprintf(stderr, "Trying to free world entity\n"); return; } - if (e >= (qcint)vec_size(prog->entitypool)) { + if (e >= (qcint_t)vec_size(prog->entitypool)) { prog->vmerror++; fprintf(stderr, "Trying to free out of bounds entity\n"); return; @@ -243,8 +287,7 @@ void prog_free_entity(qc_program *prog, qcint e) prog->entitypool[e] = false; } -qcint prog_tempstring(qc_program *prog, const char *str) -{ +qcint_t prog_tempstring(qc_program_t *prog, const char *str) { size_t len = strlen(str); size_t at = prog->tempstring_at; @@ -266,8 +309,7 @@ qcint prog_tempstring(qc_program *prog, const char *str) return at; } -static size_t print_escaped_string(const char *str, size_t maxlen) -{ +static size_t print_escaped_string(const char *str, size_t maxlen) { size_t len = 2; putchar('"'); --maxlen; /* because we're lazy and have escape sequences */ @@ -300,20 +342,21 @@ static size_t print_escaped_string(const char *str, size_t maxlen) return len; } -static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) -{ +static void trace_print_global(qc_program_t *prog, unsigned int glob, int vtype) { static char spaces[28+1] = " "; - prog_section_def *def; - qcany *value; + prog_section_def_t *def; + qcany_t *value; int len; if (!glob) { - len = printf(","); + if ((len = printf(",")) == -1) + len = 0; + goto done; } def = prog_getdef(prog, glob); - value = (qcany*)(&prog->globals[glob]); + value = (qcany_t*)(&prog->globals[glob]); len = printf("[@%u] ", glob); if (def) { @@ -354,14 +397,13 @@ static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) done: if (len < (int)sizeof(spaces)-1) { spaces[sizeof(spaces)-1-len] = 0; - file_puts(stdout, spaces); + fs_file_puts((fs_file_t*)stdout, spaces); spaces[sizeof(spaces)-1-len] = ' '; } } -static void prog_print_statement(qc_program *prog, prog_section_statement *st) -{ - if (st->opcode >= (sizeof(asm_instr)/sizeof(asm_instr[0]))) { +static void prog_print_statement(qc_program_t *prog, prog_section_statement_t *st) { + if (st->opcode >= VINSTR_END) { printf("\n", st->opcode); return; } @@ -371,7 +413,7 @@ static void prog_print_statement(qc_program *prog, prog_section_statement *st) printf("->"); printf("%s:", vec_last(prog->function_stack)); } - printf(" <> %-12s", asm_instr[st->opcode].m); + printf(" <> %-12s", util_instr_str[st->opcode]); if (st->opcode >= INSTR_IF && st->opcode <= INSTR_IFNOT) { @@ -455,12 +497,10 @@ static void prog_print_statement(qc_program *prog, prog_section_statement *st) else printf("(none)"); printf("\n"); } - fflush(stdout); } -static qcint prog_enterfunction(qc_program *prog, prog_section_function *func) -{ - qc_exec_stack st; +static qcint_t prog_enterfunction(qc_program_t *prog, prog_section_function_t *func) { + qc_exec_stack_t st; size_t parampos; int32_t p; @@ -477,17 +517,17 @@ static qcint prog_enterfunction(qc_program *prog, prog_section_function *func) #ifdef QCVM_BACKUP_STRATEGY_CALLER_VARS if (vec_size(prog->stack)) { - prog_section_function *cur; + prog_section_function_t *cur; cur = prog->stack[vec_size(prog->stack)-1].function; if (cur) { - qcint *globals = prog->globals + cur->firstlocal; + qcint_t *globals = prog->globals + cur->firstlocal; vec_append(prog->localstack, cur->locals, globals); } } #else { - qcint *globals = prog->globals + func->firstlocal; + qcint_t *globals = prog->globals + func->firstlocal; vec_append(prog->localstack, func->locals, globals); } #endif @@ -508,12 +548,11 @@ static qcint prog_enterfunction(qc_program *prog, prog_section_function *func) return func->entry; } -static qcint prog_leavefunction(qc_program *prog) -{ - prog_section_function *prev = NULL; +static qcint_t prog_leavefunction(qc_program_t *prog) { + prog_section_function_t *prev = NULL; size_t oldsp; - qc_exec_stack st = vec_last(prog->stack); + qc_exec_stack_t st = vec_last(prog->stack); if (prog->xflags & VMXF_TRACE) { if (vec_size(prog->function_stack)) @@ -530,7 +569,7 @@ static qcint prog_leavefunction(qc_program *prog) oldsp = prog->stack[vec_size(prog->stack)-1].localsp; #endif if (prev) { - qcint *globals = prog->globals + prev->firstlocal; + qcint_t *globals = prog->globals + prev->firstlocal; memcpy(globals, prog->localstack + oldsp, prev->locals * sizeof(prog->localstack[0])); /* vec_remove(prog->localstack, oldsp, vec_size(prog->localstack)-oldsp); */ vec_shrinkto(prog->localstack, oldsp); @@ -541,11 +580,10 @@ static qcint prog_leavefunction(qc_program *prog) return st.stmt - 1; /* offset the ++st */ } -bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps) -{ +bool prog_exec(qc_program_t *prog, prog_section_function_t *func, size_t flags, long maxjumps) { long jumpcount = 0; size_t oldxflags = prog->xflags; - prog_section_statement *st; + prog_section_statement_t *st; prog->vmerror = 0; prog->xflags = flags; @@ -595,11 +633,8 @@ cleanup: * main for when building the standalone executor */ -#if defined(QCVM_EXECUTOR) #include -opts_cmd_t opts; - const char *type_name[TYPE_COUNT] = { "void", "string", @@ -626,7 +661,7 @@ typedef struct { const char *value; } qcvm_parameter; -qcvm_parameter *main_params = NULL; +static qcvm_parameter *main_params = NULL; #define CheckArgs(num) do { \ if (prog->argc != (num)) { \ @@ -637,16 +672,15 @@ qcvm_parameter *main_params = NULL; } \ } while (0) -#define GetGlobal(idx) ((qcany*)(prog->globals + (idx))) +#define GetGlobal(idx) ((qcany_t*)(prog->globals + (idx))) #define GetArg(num) GetGlobal(OFS_PARM0 + 3*(num)) #define Return(any) *(GetGlobal(OFS_RETURN)) = (any) -static int qc_print(qc_program *prog) -{ +static int qc_print(qc_program_t *prog) { size_t i; const char *laststr = NULL; for (i = 0; i < (size_t)prog->argc; ++i) { - qcany *str = (qcany*)(prog->globals + OFS_PARM0 + 3*i); + qcany_t *str = (qcany_t*)(prog->globals + OFS_PARM0 + 3*i); laststr = prog_getstring(prog, str->string); printf("%s", laststr); } @@ -658,85 +692,77 @@ static int qc_print(qc_program *prog) return 0; } -static int qc_error(qc_program *prog) -{ +static int qc_error(qc_program_t *prog) { fprintf(stderr, "*** VM raised an error:\n"); qc_print(prog); prog->vmerror++; return -1; } -static int qc_ftos(qc_program *prog) -{ +static int qc_ftos(qc_program_t *prog) { char buffer[512]; - qcany *num; - qcany str; + qcany_t *num; + qcany_t str; CheckArgs(1); num = GetArg(0); - snprintf(buffer, sizeof(buffer), "%g", num->_float); + util_snprintf(buffer, sizeof(buffer), "%g", num->_float); str.string = prog_tempstring(prog, buffer); Return(str); return 0; } -static int qc_stof(qc_program *prog) -{ - qcany *str; - qcany num; +static int qc_stof(qc_program_t *prog) { + qcany_t *str; + qcany_t num; CheckArgs(1); str = GetArg(0); - num._float = strtof(prog_getstring(prog, str->string), NULL); + num._float = (float)strtod(prog_getstring(prog, str->string), NULL); Return(num); return 0; } -static int qc_vtos(qc_program *prog) -{ +static int qc_vtos(qc_program_t *prog) { char buffer[512]; - qcany *num; - qcany str; + qcany_t *num; + qcany_t str; CheckArgs(1); num = GetArg(0); - snprintf(buffer, sizeof(buffer), "'%g %g %g'", num->vector[0], num->vector[1], num->vector[2]); + util_snprintf(buffer, sizeof(buffer), "'%g %g %g'", num->vector[0], num->vector[1], num->vector[2]); str.string = prog_tempstring(prog, buffer); Return(str); return 0; } -static int qc_etos(qc_program *prog) -{ +static int qc_etos(qc_program_t *prog) { char buffer[512]; - qcany *num; - qcany str; + qcany_t *num; + qcany_t str; CheckArgs(1); num = GetArg(0); - snprintf(buffer, sizeof(buffer), "%i", num->_int); + util_snprintf(buffer, sizeof(buffer), "%i", num->_int); str.string = prog_tempstring(prog, buffer); Return(str); return 0; } -static int qc_spawn(qc_program *prog) -{ - qcany ent; +static int qc_spawn(qc_program_t *prog) { + qcany_t ent; CheckArgs(0); ent.edict = prog_spawn_entity(prog); Return(ent); return (ent.edict ? 0 : -1); } -static int qc_kill(qc_program *prog) -{ - qcany *ent; +static int qc_kill(qc_program_t *prog) { + qcany_t *ent; CheckArgs(1); ent = GetArg(0); prog_free_entity(prog, ent->edict); return 0; } -static int qc_sqrt(qc_program *prog) -{ - qcany *num, out; +static int qc_sqrt(qc_program_t *prog) { + qcany_t *num, out; CheckArgs(1); num = GetArg(0); out._float = sqrt(num->_float); @@ -744,9 +770,8 @@ static int qc_sqrt(qc_program *prog) return 0; } -static int qc_vlen(qc_program *prog) -{ - qcany *vec, len; +static int qc_vlen(qc_program_t *prog) { + qcany_t *vec, len; CheckArgs(1); vec = GetArg(0); len._float = sqrt(vec->vector[0] * vec->vector[0] + @@ -756,11 +781,10 @@ static int qc_vlen(qc_program *prog) return 0; } -static int qc_normalize(qc_program *prog) -{ +static int qc_normalize(qc_program_t *prog) { double len; - qcany *vec; - qcany out; + qcany_t *vec; + qcany_t out; CheckArgs(1); vec = GetArg(0); len = sqrt(vec->vector[0] * vec->vector[0] + @@ -777,13 +801,14 @@ static int qc_normalize(qc_program *prog) return 0; } -static int qc_strcat(qc_program *prog) -{ +static int qc_strcat(qc_program_t *prog) { char *buffer; size_t len1, len2; - char *cstr1, *cstr2; - qcany *str1, *str2; - qcany out; + qcany_t *str1, *str2; + qcany_t out; + + const char *cstr1; + const char *cstr2; CheckArgs(2); str1 = GetArg(0); @@ -801,11 +826,12 @@ static int qc_strcat(qc_program *prog) return 0; } -static int qc_strcmp(qc_program *prog) -{ - char *cstr1, *cstr2; - qcany *str1, *str2; - qcany out; +static int qc_strcmp(qc_program_t *prog) { + qcany_t *str1, *str2; + qcany_t out; + + const char *cstr1; + const char *cstr2; if (prog->argc != 2 && prog->argc != 3) { fprintf(stderr, "ERROR: invalid number of arguments for strcmp/strncmp: %i, expected 2 or 3\n", @@ -825,7 +851,26 @@ static int qc_strcmp(qc_program *prog) return 0; } -static prog_builtin qc_builtins[] = { +static int qc_floor(qc_program_t *prog) { + qcany_t *num, out; + CheckArgs(1); + num = GetArg(0); + out._float = floor(num->_float); + Return(out); + return 0; +} + +static int qc_pow(qc_program_t *prog) { + qcany_t *base, *exp, out; + CheckArgs(2); + base = GetArg(0); + exp = GetArg(1); + out._float = powf(base->_float, exp->_float); + Return(out); + return 0; +} + +static prog_builtin_t qc_builtins[] = { NULL, &qc_print, /* 1 */ &qc_ftos, /* 2 */ @@ -839,13 +884,14 @@ static prog_builtin qc_builtins[] = { &qc_strcat, /* 10 */ &qc_strcmp, /* 11 */ &qc_normalize, /* 12 */ - &qc_sqrt /* 13 */ + &qc_sqrt, /* 13 */ + &qc_floor, /* 14 */ + &qc_pow /* 15 */ }; -static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]); static const char *arg0 = NULL; -static void version() { +static void version(void) { printf("GMQCC-QCVM %d.%d.%d Built %s %s\n", GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, @@ -855,8 +901,7 @@ static void version() { ); } -static void usage() -{ +static void usage(void) { printf("usage: %s [options] [parameters] file\n", arg0); printf("options:\n"); printf(" -h, --help print this message\n" @@ -876,10 +921,9 @@ static void usage() " -string pass a string parameter to main() \n"); } -static void prog_main_setparams(qc_program *prog) -{ +static void prog_main_setparams(qc_program_t *prog) { size_t i; - qcany *arg; + qcany_t *arg; for (i = 0; i < vec_size(main_params); ++i) { arg = GetGlobal(OFS_PARM0 + 3*i); @@ -888,17 +932,10 @@ static void prog_main_setparams(qc_program *prog) arg->vector[2] = 0; switch (main_params[i].vtype) { case TYPE_VECTOR: -#ifdef _MSC_VER - (void)sscanf_s(main_params[i].value, " %f %f %f ", - &arg->vector[0], - &arg->vector[1], - &arg->vector[2]); -#else - (void)sscanf(main_params[i].value, " %f %f %f ", - &arg->vector[0], - &arg->vector[1], - &arg->vector[2]); -#endif + (void)util_sscanf(main_params[i].value, " %f %f %f ", + &arg->vector[0], + &arg->vector[1], + &arg->vector[2]); break; case TYPE_FLOAT: arg->_float = atof(main_params[i].value); @@ -913,12 +950,12 @@ static void prog_main_setparams(qc_program *prog) } } -void prog_disasm_function(qc_program *prog, size_t id); -int main(int argc, char **argv) -{ +static void prog_disasm_function(qc_program_t *prog, size_t id); + +int main(int argc, char **argv) { size_t i; - qcint fnmain = -1; - qc_program *prog; + qcint_t fnmain = -1; + qc_program_t *prog; size_t xflags = VMXF_DEFAULT; bool opts_printfields = false; bool opts_printdefs = false; @@ -934,7 +971,7 @@ int main(int argc, char **argv) if (argc < 2) { usage(); - exit(1); + exit(EXIT_FAILURE); } while (argc > 1) { @@ -943,7 +980,7 @@ int main(int argc, char **argv) !strcmp(argv[1], "--help")) { usage(); - exit(0); + exit(EXIT_SUCCESS); } else if (!strcmp(argv[1], "-v")) { ++opts_v; @@ -957,7 +994,7 @@ int main(int argc, char **argv) ++opts_v; else { usage(); - exit(1); + exit(EXIT_FAILURE); } } --argc; @@ -967,7 +1004,7 @@ int main(int argc, char **argv) !strcmp(argv[1], "--version")) { version(); - exit(0); + exit(EXIT_SUCCESS); } else if (!strcmp(argv[1], "-trace")) { --argc; @@ -996,7 +1033,7 @@ int main(int argc, char **argv) ++argv; if (argc <= 1) { usage(); - exit(1); + exit(EXIT_FAILURE); } vec_push(dis_list, argv[1]); --argc; @@ -1032,12 +1069,14 @@ int main(int argc, char **argv) p.vtype = TYPE_STRING; else if (argv[1][1] == 'v') p.vtype = TYPE_VECTOR; + else + p.vtype = TYPE_VOID; --argc; ++argv; if (argc < 2) { usage(); - exit(1); + exit(EXIT_FAILURE); } p.value = argv[1]; @@ -1054,7 +1093,7 @@ int main(int argc, char **argv) if (progsfile) { fprintf(stderr, "only 1 program file may be specified\n"); usage(); - exit(1); + exit(EXIT_FAILURE); } progsfile = argv[1]; --argc; @@ -1064,7 +1103,7 @@ int main(int argc, char **argv) { fprintf(stderr, "unknown parameter: %s\n", argv[1]); usage(); - exit(1); + exit(EXIT_FAILURE); } } @@ -1077,17 +1116,17 @@ int main(int argc, char **argv) if (!progsfile) { fprintf(stderr, "must specify a program to execute\n"); usage(); - exit(1); + exit(EXIT_FAILURE); } prog = prog_load(progsfile, noexec); if (!prog) { fprintf(stderr, "failed to load program '%s'\n", progsfile); - exit(1); + exit(EXIT_FAILURE); } prog->builtins = qc_builtins; - prog->builtins_count = qc_builtins_count; + prog->builtins_count = GMQCC_ARRAY_COUNT(qc_builtins); if (opts_info) { printf("Program's system-checksum = 0x%04x\n", (unsigned int)prog->crc16); @@ -1127,6 +1166,7 @@ int main(int argc, char **argv) return 0; } if (opts_printdefs) { + const char *getstring = NULL; for (i = 0; i < vec_size(prog->defs); ++i) { printf("Global: %8s %-16s at %u%s", type_name[prog->defs[i].type & DEF_TYPEMASK], @@ -1136,19 +1176,22 @@ int main(int argc, char **argv) if (opts_v) { switch (prog->defs[i].type & DEF_TYPEMASK) { case TYPE_FLOAT: - printf(" [init: %g]", ((qcany*)(prog->globals + prog->defs[i].offset))->_float); + printf(" [init: %g]", ((qcany_t*)(prog->globals + prog->defs[i].offset))->_float); break; case TYPE_INTEGER: - printf(" [init: %i]", (int)( ((qcany*)(prog->globals + prog->defs[i].offset))->_int )); + printf(" [init: %i]", (int)( ((qcany_t*)(prog->globals + prog->defs[i].offset))->_int )); break; case TYPE_ENTITY: case TYPE_FUNCTION: case TYPE_FIELD: case TYPE_POINTER: - printf(" [init: %u]", (unsigned)( ((qcany*)(prog->globals + prog->defs[i].offset))->_int )); + printf(" [init: %u]", (unsigned)( ((qcany_t*)(prog->globals + prog->defs[i].offset))->_int )); break; case TYPE_STRING: - printf(" [init: `%s`]", prog_getstring(prog, ((qcany*)(prog->globals + prog->defs[i].offset))->string )); + getstring = prog_getstring(prog, ((qcany_t*)(prog->globals + prog->defs[i].offset))->string); + printf(" [init: `"); + print_escaped_string(getstring, strlen(getstring)); + printf("`]\n"); break; default: break; @@ -1169,7 +1212,7 @@ int main(int argc, char **argv) if (opts_printfuns) { for (i = 0; i < vec_size(prog->functions); ++i) { int32_t a; - printf("Function: %-16s taking %i parameters:(", + printf("Function: %-16s taking %u parameters:(", prog_getstring(prog, prog->functions[i].name), (unsigned int)prog->functions[i].nargs); for (a = 0; a < prog->functions[i].nargs; ++a) { @@ -1181,7 +1224,7 @@ int main(int argc, char **argv) printf(") builtin %i\n", (int)-start); else { size_t funsize = 0; - prog_section_statement *st = prog->code + start; + prog_section_statement_t *st = prog->code + start; for (;st->opcode != INSTR_DONE; ++st) ++funsize; printf(") - %lu instructions", (unsigned long)funsize); @@ -1207,7 +1250,7 @@ int main(int argc, char **argv) for (i = 1; i < vec_size(prog->functions); ++i) { const char *name = prog_getstring(prog, prog->functions[i].name); if (!strcmp(name, "main")) - fnmain = (qcint)i; + fnmain = (qcint_t)i; } if (fnmain > 0) { @@ -1222,10 +1265,9 @@ int main(int argc, char **argv) return 0; } -void prog_disasm_function(qc_program *prog, size_t id) -{ - prog_section_function *fdef = prog->functions + id; - prog_section_statement *st; +static void prog_disasm_function(qc_program_t *prog, size_t id) { + prog_section_function_t *fdef = prog->functions + id; + prog_section_statement_t *st; if (fdef->entry < 0) { printf("FUNCTION \"%s\" = builtin #%i\n", prog_getstring(prog, fdef->name), (int)-fdef->entry); @@ -1240,7 +1282,6 @@ void prog_disasm_function(qc_program *prog, size_t id) ++st; } } -#endif #else /* !QCVM_LOOP */ /* * Everything from here on is not including into the compilation of the @@ -1250,21 +1291,21 @@ void prog_disasm_function(qc_program *prog, size_t id) * sort of isn't, which makes it nicer looking. */ -#define OPA ( (qcany*) (prog->globals + st->o1.u1) ) -#define OPB ( (qcany*) (prog->globals + st->o2.u1) ) -#define OPC ( (qcany*) (prog->globals + st->o3.u1) ) +#define OPA ( (qcany_t*) (prog->globals + st->o1.u1) ) +#define OPB ( (qcany_t*) (prog->globals + st->o2.u1) ) +#define OPC ( (qcany_t*) (prog->globals + st->o3.u1) ) -#define GLOBAL(x) ( (qcany*) (prog->globals + (x)) ) +#define GLOBAL(x) ( (qcany_t*) (prog->globals + (x)) ) /* to be consistent with current darkplaces behaviour */ #if !defined(FLOAT_IS_TRUE_FOR_INT) # define FLOAT_IS_TRUE_FOR_INT(x) ( (x) & 0x7FFFFFFF ) #endif -while (1) { - prog_section_function *newf; - qcany *ed; - qcany *ptr; +while (prog->vmerror == 0) { + prog_section_function_t *newf; + qcany_t *ed; + qcany_t *ptr; ++st; @@ -1305,7 +1346,7 @@ while (1) { break; case INSTR_MUL_FV: { - qcfloat f = OPA->_float; + qcfloat_t f = OPA->_float; OPC->vector[0] = f * OPB->vector[0]; OPC->vector[1] = f * OPB->vector[1]; OPC->vector[2] = f * OPB->vector[2]; @@ -1313,7 +1354,7 @@ while (1) { } case INSTR_MUL_VF: { - qcfloat f = OPB->_float; + qcfloat_t f = OPB->_float; OPC->vector[0] = f * OPA->vector[0]; OPC->vector[1] = f * OPA->vector[1]; OPC->vector[2] = f * OPA->vector[2]; @@ -1409,14 +1450,14 @@ while (1) { goto cleanup; } ed = prog_getedict(prog, OPA->edict); - OPC->_int = ((qcany*)( ((qcint*)ed) + OPB->_int ))->_int; + OPC->_int = ((qcany_t*)( ((qcint_t*)ed) + OPB->_int ))->_int; break; case INSTR_LOAD_V: if (OPA->edict < 0 || OPA->edict >= prog->entities) { qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename); goto cleanup; } - if (OPB->_int < 0 || OPB->_int + 3 > (qcint)prog->entityfields) + if (OPB->_int < 0 || OPB->_int + 3 > (qcint_t)prog->entityfields) { qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)", prog->filename, @@ -1424,7 +1465,7 @@ while (1) { goto cleanup; } ed = prog_getedict(prog, OPA->edict); - ptr = (qcany*)( ((qcint*)ed) + OPB->_int ); + ptr = (qcany_t*)( ((qcint_t*)ed) + OPB->_int ); OPC->ivector[0] = ptr->ivector[0]; OPC->ivector[1] = ptr->ivector[1]; OPC->ivector[2] = ptr->ivector[2]; @@ -1444,7 +1485,7 @@ while (1) { } ed = prog_getedict(prog, OPA->edict); - OPC->_int = ((qcint*)ed) - prog->entitydata + OPB->_int; + OPC->_int = ((qcint_t*)ed) - prog->entitydata + OPB->_int; break; case INSTR_STORE_F: @@ -1465,29 +1506,29 @@ while (1) { case INSTR_STOREP_ENT: case INSTR_STOREP_FLD: case INSTR_STOREP_FNC: - if (OPB->_int < 0 || OPB->_int >= (qcint)vec_size(prog->entitydata)) { + if (OPB->_int < 0 || OPB->_int >= (qcint_t)vec_size(prog->entitydata)) { qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int); goto cleanup; } - if (OPB->_int < (qcint)prog->entityfields && !prog->allowworldwrites) + if (OPB->_int < (qcint_t)prog->entityfields && !prog->allowworldwrites) qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n", prog->filename, prog_getstring(prog, prog_entfield(prog, OPB->_int)->name), OPB->_int); - ptr = (qcany*)(prog->entitydata + OPB->_int); + ptr = (qcany_t*)(prog->entitydata + OPB->_int); ptr->_int = OPA->_int; break; case INSTR_STOREP_V: - if (OPB->_int < 0 || OPB->_int + 2 >= (qcint)vec_size(prog->entitydata)) { + if (OPB->_int < 0 || OPB->_int + 2 >= (qcint_t)vec_size(prog->entitydata)) { qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int); goto cleanup; } - if (OPB->_int < (qcint)prog->entityfields && !prog->allowworldwrites) + if (OPB->_int < (qcint_t)prog->entityfields && !prog->allowworldwrites) qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n", prog->filename, prog_getstring(prog, prog_entfield(prog, OPB->_int)->name), OPB->_int); - ptr = (qcany*)(prog->entitydata + OPB->_int); + ptr = (qcany_t*)(prog->entitydata + OPB->_int); ptr->ivector[0] = OPA->ivector[0]; ptr->ivector[1] = OPA->ivector[1]; ptr->ivector[2] = OPA->ivector[2]; @@ -1543,7 +1584,7 @@ while (1) { if (!OPA->function) qcvmerror(prog, "NULL function in `%s`", prog->filename); - if(!OPA->function || OPA->function >= (qcint)vec_size(prog->functions)) + if(!OPA->function || OPA->function >= (qcint_t)vec_size(prog->functions)) { qcvmerror(prog, "CALL outside the program in `%s`", prog->filename); goto cleanup; @@ -1557,8 +1598,8 @@ while (1) { if (newf->entry < 0) { /* negative statements are built in functions */ - qcint builtinnumber = -newf->entry; - if (builtinnumber < (qcint)prog->builtins_count && prog->builtins[builtinnumber]) + qcint_t builtinnumber = -newf->entry; + if (builtinnumber < (qcint_t)prog->builtins_count && prog->builtins[builtinnumber]) prog->builtins[builtinnumber](prog); else qcvmerror(prog, "No such builtin #%i in %s! Try updating your gmqcc sources", @@ -1571,8 +1612,24 @@ while (1) { break; case INSTR_STATE: - qcvmerror(prog, "`%s` tried to execute a STATE operation", prog->filename); + { + qcfloat_t *nextthink; + qcfloat_t *time; + qcfloat_t *frame; + if (!prog->supports_state) { + qcvmerror(prog, "`%s` tried to execute a STATE operation but misses its defs!", prog->filename); + goto cleanup; + } + ed = prog_getedict(prog, prog->globals[prog->cached_globals.self]); + ((qcint_t*)ed)[prog->cached_fields.think] = OPB->function; + + frame = (qcfloat_t*)&((qcint_t*)ed)[prog->cached_fields.frame]; + *frame = OPA->_float; + nextthink = (qcfloat_t*)&((qcint_t*)ed)[prog->cached_fields.nextthink]; + time = (qcfloat_t*)(prog->globals + prog->cached_globals.time); + *nextthink = *time + 0.1; break; + } case INSTR_GOTO: st += st->o1.s1 - 1; /* offset the s++ */