X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=exec.c;h=455a6c5805555afecc81a392ee17486b1d225958;hp=229454d7f89936d460c8ab84fd38db1977cc2903;hb=ff37abb0c7c60481e1264914fa5e02e9986c5cd9;hpb=70f676784d26be21b943e221ad8834b42c3d63bf diff --git a/exec.c b/exec.c index 229454d..455a6c5 100644 --- a/exec.c +++ b/exec.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 + * Copyright (C) 2012, 2013, 2014, 2015 * Wolfgang Bumiller * Dale Weiler * @@ -23,28 +23,12 @@ */ #ifndef QCVM_LOOP #include -#include +#include #include -#include +#include #include "gmqcc.h" -/* -(prog_section_statement, code) -(prog_section_def, defs) -(prog_section_def, fields) -(prog_section_function, functions) -(char, strings) -(qcint, globals) -(qcint, entitydata) -(bool, entitypool) -(qcint, localstack) -(qc_exec_stack, stack) -(size_t, profile) -(prog_builtin, builtins) -(const char*, function_stack) -*/ - static void loaderror(const char *fmt, ...) { int err = errno; @@ -52,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; @@ -67,32 +51,41 @@ static void qcvmerror(qc_program *prog, const char *fmt, ...) putchar('\n'); } -qc_program* prog_load(const char *filename) +qc_program_t* prog_load(const char *filename, bool skipversion) { - qc_program *prog; - prog_header header; - FILE *file; + 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; - file = util_fopen(filename, "rb"); if (!file) return NULL; - if (fread(&header, sizeof(header), 1, file) != 1) { + if (fs_file_read(&header, sizeof(header), 1, file) != 1) { loaderror("failed to read header from '%s'", filename); - fclose(file); + fs_file_close(file); return NULL; } - if (header.version != 6) { + 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); - fclose(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) { - fclose(file); - printf("failed to allocate program data\n"); + fs_file_close(file); + fprintf(stderr, "failed to allocate program data\n"); return NULL; } memset(prog, 0, sizeof(*prog)); @@ -107,15 +100,17 @@ qc_program* prog_load(const char *filename) } #define read_data(hdrvar, progvar, reserved) \ - if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \ + if (fs_file_seek(file, header.hdrvar.offset, SEEK_SET) != 0) { \ loaderror("seek failed"); \ goto error; \ } \ - if (fread(vec_add(prog->progvar, header.hdrvar.length + reserved), \ - sizeof(*prog->progvar), \ - header.hdrvar.length, file) \ - != header.hdrvar.length) \ - { \ + if (fs_file_read ( \ + vec_add(prog->progvar, header.hdrvar.length + reserved), \ + sizeof(*prog->progvar), \ + header.hdrvar.length, \ + file \ + )!= header.hdrvar.length \ + ) { \ loaderror("read failed"); \ goto error; \ } @@ -129,7 +124,13 @@ qc_program* prog_load(const char *filename) read_data1(strings); read_data2(globals, 2); /* reserve more in case a RETURN using with the global at "the end" exists */ - fclose(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)); @@ -144,6 +145,36 @@ qc_program* prog_load(const char *filename) 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: @@ -158,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); @@ -182,15 +215,15 @@ void prog_delete(qc_program *prog) * VM code */ -char* prog_getstring(qc_program *prog, qcint str) -{ - if (str < 0 || str >= (qcint)vec_size(prog->strings)) - return "<<>>"; +const char* prog_getstring(qc_program_t *prog, qcint_t str) { + /* cast for return required for C++ */ + 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) @@ -199,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) { @@ -209,61 +242,52 @@ 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++; - printf("Accessing out of bounds edict %i\n", (int)e); + 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++; - printf("Trying to free world entity\n"); + 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++; - printf("Trying to free out of bounds entity\n"); + fprintf(stderr, "Trying to free out of bounds entity\n"); return; } if (!prog->entitypool[e]) { prog->vmerror++; - printf("Double free on entity\n"); + fprintf(stderr, "Double free on entity\n"); return; } prog->entitypool[e] = false; } -qcint prog_tempstring(qc_program *prog, const char *_str) -{ - /* we don't access it, but the macro-generated functions don't use - * const - */ - char *str = (char*)_str; - +qcint_t prog_tempstring(qc_program_t *prog, const char *str) { size_t len = strlen(str); size_t at = prog->tempstring_at; @@ -285,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 */ @@ -319,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) { @@ -358,7 +382,10 @@ static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) value->vector[2]); break; case TYPE_STRING: - len += print_escaped_string(prog_getstring(prog, value->string), sizeof(spaces)-len-5); + if (value->string) + len += print_escaped_string(prog_getstring(prog, value->string), sizeof(spaces)-len-5); + else + len += printf("(null)"); len += printf(","); /* len += printf("\"%s\",", prog_getstring(prog, value->string)); */ break; @@ -370,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; - printf(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; } @@ -387,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) { @@ -471,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; @@ -486,23 +510,24 @@ static qcint prog_enterfunction(qc_program *prog, prog_section_function *func) st.function = func; if (prog->xflags & VMXF_TRACE) { - vec_push(prog->function_stack, prog_getstring(prog, func->name)); + const char *str = prog_getstring(prog, func->name); + vec_push(prog->function_stack, str); } #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 @@ -523,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)) @@ -545,8 +569,8 @@ 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; - memcpy(globals, prog->localstack + oldsp, prev->locals); + 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); } @@ -556,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; @@ -576,28 +599,24 @@ bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long #define QCVM_PROFILE 0 #define QCVM_TRACE 0 # include __FILE__ - break; } case (VMXF_TRACE): { #define QCVM_PROFILE 0 #define QCVM_TRACE 1 # include __FILE__ - break; } case (VMXF_PROFILE): { #define QCVM_PROFILE 1 #define QCVM_TRACE 0 # include __FILE__ - break; } case (VMXF_TRACE|VMXF_PROFILE): { #define QCVM_PROFILE 1 #define QCVM_TRACE 1 # include __FILE__ - break; } }; @@ -614,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", @@ -628,10 +644,16 @@ const char *type_name[TYPE_COUNT] = { "field", "function", "pointer", -#if 0 "integer", -#endif - "variant" + + "variant", + + "struct", + "union", + "array", + + "nil", + "noexpr" }; typedef struct { @@ -639,28 +661,28 @@ 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)) { \ prog->vmerror++; \ - printf("ERROR: invalid number of arguments for %s: %i, expected %i\n", \ + fprintf(stderr, "ERROR: invalid number of arguments for %s: %i, expected %i\n", \ __FUNCTION__, prog->argc, (num)); \ return -1; \ } \ } 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); - printf("%s", (laststr = prog_getstring(prog, str->string))); + qcany_t *str = (qcany_t*)(prog->globals + OFS_PARM0 + 3*i); + laststr = prog_getstring(prog, str->string); + printf("%s", laststr); } if (laststr && (prog->xflags & VMXF_TRACE)) { size_t len = strlen(laststr); @@ -670,85 +692,86 @@ static int qc_print(qc_program *prog) return 0; } -static int qc_error(qc_program *prog) -{ - printf("*** VM raised an error:\n"); +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_vlen(qc_program *prog) -{ - qcany *vec, len; +static int qc_sqrt(qc_program_t *prog) { + qcany_t *num, out; + CheckArgs(1); + num = GetArg(0); + out._float = sqrt(num->_float); + Return(out); + return 0; +} + +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] + @@ -758,44 +781,149 @@ static int qc_vlen(qc_program *prog) return 0; } -static prog_builtin qc_builtins[] = { +static int qc_normalize(qc_program_t *prog) { + double len; + qcany_t *vec; + qcany_t out; + CheckArgs(1); + vec = GetArg(0); + len = sqrt(vec->vector[0] * vec->vector[0] + + vec->vector[1] * vec->vector[1] + + vec->vector[2] * vec->vector[2]); + if (len) + len = 1.0 / len; + else + len = 0; + out.vector[0] = len * vec->vector[0]; + out.vector[1] = len * vec->vector[1]; + out.vector[2] = len * vec->vector[2]; + Return(out); + return 0; +} + +static int qc_strcat(qc_program_t *prog) { + char *buffer; + size_t len1, len2; + qcany_t *str1, *str2; + qcany_t out; + + const char *cstr1; + const char *cstr2; + + CheckArgs(2); + str1 = GetArg(0); + str2 = GetArg(1); + cstr1 = prog_getstring(prog, str1->string); + cstr2 = prog_getstring(prog, str2->string); + len1 = strlen(cstr1); + len2 = strlen(cstr2); + buffer = (char*)mem_a(len1 + len2 + 1); + memcpy(buffer, cstr1, len1); + memcpy(buffer+len1, cstr2, len2+1); + out.string = prog_tempstring(prog, buffer); + mem_d(buffer); + Return(out); + return 0; +} + +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", + prog->argc); + return -1; + } + + str1 = GetArg(0); + str2 = GetArg(1); + cstr1 = prog_getstring(prog, str1->string); + cstr2 = prog_getstring(prog, str2->string); + if (prog->argc == 3) + out._float = strncmp(cstr1, cstr2, GetArg(2)->_float); + else + out._float = strcmp(cstr1, cstr2); + Return(out); + return 0; +} + +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 */ - &qc_spawn, /* 3 */ - &qc_kill, /* 4 */ - &qc_vtos, /* 5 */ - &qc_error, /* 6 */ - &qc_vlen, /* 7 */ - &qc_etos, /* 8 */ - &qc_stof /* 9 */ + &qc_print, /* 1 */ + &qc_ftos, /* 2 */ + &qc_spawn, /* 3 */ + &qc_kill, /* 4 */ + &qc_vtos, /* 5 */ + &qc_error, /* 6 */ + &qc_vlen, /* 7 */ + &qc_etos, /* 8 */ + &qc_stof, /* 9 */ + &qc_strcat, /* 10 */ + &qc_strcmp, /* 11 */ + &qc_normalize, /* 12 */ + &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; -void usage() -{ +static void version(void) { + printf("GMQCC-QCVM %d.%d.%d Built %s %s\n", + GMQCC_VERSION_MAJOR, + GMQCC_VERSION_MINOR, + GMQCC_VERSION_PATCH, + __DATE__, + __TIME__ + ); +} + +static void usage(void) { printf("usage: %s [options] [parameters] file\n", arg0); printf("options:\n"); - printf(" -h, --help print this message\n" - " -trace trace the execution\n" - " -profile perform profiling during execution\n" - " -info print information from the prog's header\n" - " -disasm disassemble and exit\n" - " -printdefs list the defs section\n" - " -printfields list the field section\n" - " -printfuns list functions information\n"); + printf(" -h, --help print this message\n" + " -trace trace the execution\n" + " -profile perform profiling during execution\n" + " -info print information from the prog's header\n" + " -disasm disassemble and exit\n" + " -disasm-func func disassemble and exit\n" + " -printdefs list the defs section\n" + " -printfields list the field section\n" + " -printfuns list functions information\n" + " -v be verbose\n" + " -vv be even more verbose\n"); printf("parameters:\n"); printf(" -vector pass a vector parameter to main()\n" " -float pass a float parameter to main()\n" " -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); @@ -804,17 +932,10 @@ static void prog_main_setparams(qc_program *prog) arg->vector[2] = 0; switch (main_params[i].vtype) { case TYPE_VECTOR: -#ifdef WIN32 - (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); @@ -823,18 +944,18 @@ static void prog_main_setparams(qc_program *prog) arg->string = prog_tempstring(prog, main_params[i].value); break; default: - printf("error: unhandled parameter type: %i\n", main_params[i].vtype); + fprintf(stderr, "error: unhandled parameter type: %i\n", main_params[i].vtype); break; } } } -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; @@ -842,21 +963,48 @@ int main(int argc, char **argv) bool opts_disasm = false; bool opts_info = false; bool noexec = false; + const char *progsfile = NULL; + const char **dis_list = NULL; + int opts_v = 0; arg0 = argv[0]; if (argc < 2) { usage(); - exit(1); + exit(EXIT_FAILURE); } - while (argc > 2) { + while (argc > 1) { if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "-help") || !strcmp(argv[1], "--help")) { usage(); - exit(0); + exit(EXIT_SUCCESS); + } + else if (!strcmp(argv[1], "-v")) { + ++opts_v; + --argc; + ++argv; + } + else if (!strncmp(argv[1], "-vv", 3)) { + const char *av = argv[1]+1; + for (; *av; ++av) { + if (*av == 'v') + ++opts_v; + else { + usage(); + exit(EXIT_FAILURE); + } + } + --argc; + ++argv; + } + else if (!strcmp(argv[1], "-version") || + !strcmp(argv[1], "--version")) + { + version(); + exit(EXIT_SUCCESS); } else if (!strcmp(argv[1], "-trace")) { --argc; @@ -880,6 +1028,18 @@ int main(int argc, char **argv) opts_disasm = true; noexec = true; } + else if (!strcmp(argv[1], "-disasm-func")) { + --argc; + ++argv; + if (argc <= 1) { + usage(); + exit(EXIT_FAILURE); + } + vec_push(dis_list, argv[1]); + --argc; + ++argv; + noexec = true; + } else if (!strcmp(argv[1], "-printdefs")) { --argc; ++argv; @@ -909,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 < 3) { + if (argc < 2) { usage(); - exit(1); + exit(EXIT_FAILURE); } p.value = argv[1]; @@ -922,45 +1084,120 @@ int main(int argc, char **argv) --argc; ++argv; } + else if (!strcmp(argv[1], "--")) { + --argc; + ++argv; + break; + } + else if (argv[1][0] != '-') { + if (progsfile) { + fprintf(stderr, "only 1 program file may be specified\n"); + usage(); + exit(EXIT_FAILURE); + } + progsfile = argv[1]; + --argc; + ++argv; + } else { + fprintf(stderr, "unknown parameter: %s\n", argv[1]); usage(); - exit(1); + exit(EXIT_FAILURE); } } + if (argc == 2 && !progsfile) { + progsfile = argv[1]; + --argc; + ++argv; + } + + if (!progsfile) { + fprintf(stderr, "must specify a program to execute\n"); + usage(); + exit(EXIT_FAILURE); + } - prog = prog_load(argv[1]); + prog = prog_load(progsfile, noexec); if (!prog) { - printf("failed to load program '%s'\n", argv[1]); - exit(1); + fprintf(stderr, "failed to load program '%s'\n", progsfile); + 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); printf("Entity field space: %u\n", (unsigned int)prog->entityfields); printf("Globals: %u\n", (unsigned int)vec_size(prog->globals)); + printf("Counts:\n" + " code: %lu\n" + " defs: %lu\n" + " fields: %lu\n" + " functions: %lu\n" + " strings: %lu\n", + (unsigned long)vec_size(prog->code), + (unsigned long)vec_size(prog->defs), + (unsigned long)vec_size(prog->fields), + (unsigned long)vec_size(prog->functions), + (unsigned long)vec_size(prog->strings)); } if (opts_info) { prog_delete(prog); return 0; } + for (i = 0; i < vec_size(dis_list); ++i) { + size_t k; + printf("Looking for `%s`\n", dis_list[i]); + for (k = 1; k < vec_size(prog->functions); ++k) { + const char *name = prog_getstring(prog, prog->functions[k].name); + if (!strcmp(name, dis_list[i])) { + prog_disasm_function(prog, k); + break; + } + } + } if (opts_disasm) { for (i = 1; i < vec_size(prog->functions); ++i) prog_disasm_function(prog, i); 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\n", + printf("Global: %8s %-16s at %u%s", type_name[prog->defs[i].type & DEF_TYPEMASK], prog_getstring(prog, prog->defs[i].name), (unsigned int)prog->defs[i].offset, ((prog->defs[i].type & DEF_SAVEGLOBAL) ? " [SAVE]" : "")); + if (opts_v) { + switch (prog->defs[i].type & DEF_TYPEMASK) { + case TYPE_FLOAT: + printf(" [init: %g]", ((qcany_t*)(prog->globals + prog->defs[i].offset))->_float); + break; + case TYPE_INTEGER: + 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_t*)(prog->globals + prog->defs[i].offset))->_int )); + break; + case TYPE_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; + } + } + printf("\n"); } } if (opts_printfields) { @@ -975,22 +1212,45 @@ 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) { printf(" %i", prog->functions[i].argsize[a]); } - printf(") locals: %i + %i\n", - prog->functions[i].firstlocal, - prog->functions[i].locals); + if (opts_v > 1) { + int32_t start = prog->functions[i].entry; + if (start < 0) + printf(") builtin %i\n", (int)-start); + else { + size_t funsize = 0; + prog_section_statement_t *st = prog->code + start; + for (;st->opcode != INSTR_DONE; ++st) + ++funsize; + printf(") - %lu instructions", (unsigned long)funsize); + if (opts_v > 2) { + printf(" - locals: %i + %i\n", + prog->functions[i].firstlocal, + prog->functions[i].locals); + } + else + printf("\n"); + } + } + else if (opts_v) { + printf(") locals: %i + %i\n", + prog->functions[i].firstlocal, + prog->functions[i].locals); + } + else + printf(")\n"); } } if (!noexec) { 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) { @@ -998,17 +1258,16 @@ int main(int argc, char **argv) prog_exec(prog, &prog->functions[fnmain], xflags, VM_JUMPS_DEFAULT); } else - printf("No main function found\n"); + fprintf(stderr, "No main function found\n"); } prog_delete(prog); 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); @@ -1023,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 @@ -1033,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; @@ -1087,15 +1345,21 @@ while (1) { OPA->vector[2]*OPB->vector[2]; break; case INSTR_MUL_FV: - OPC->vector[0] = OPA->_float * OPB->vector[0]; - OPC->vector[1] = OPA->_float * OPB->vector[1]; - OPC->vector[2] = OPA->_float * OPB->vector[2]; + { + 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]; break; + } case INSTR_MUL_VF: - OPC->vector[0] = OPB->_float * OPA->vector[0]; - OPC->vector[1] = OPB->_float * OPA->vector[1]; - OPC->vector[2] = OPB->_float * OPA->vector[2]; + { + 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]; break; + } case INSTR_DIV_F: if (OPB->_float != 0.0f) OPC->_float = OPA->_float / OPB->_float; @@ -1186,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, @@ -1201,9 +1465,10 @@ while (1) { goto cleanup; } ed = prog_getedict(prog, OPA->edict); - OPC->ivector[0] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[0]; - OPC->ivector[1] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[1]; - OPC->ivector[2] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[2]; + 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]; break; case INSTR_ADDRESS: @@ -1220,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: @@ -1241,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]; @@ -1319,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; @@ -1333,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", @@ -1347,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++ */