X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=exec.c;h=0ef32119a0a475a3c9446b314c423ea2f2152622;hp=2383ad70e5bf23827dae59e657b7877252745d3e;hb=10dd7aacfe87f97e10d61dff343e00b9c03eac69;hpb=2531a3695f3a58a7c4be40a62495aa35215835de diff --git a/exec.c b/exec.c index 2383ad7..0ef3211 100644 --- a/exec.c +++ b/exec.c @@ -36,7 +36,7 @@ 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, ...) @@ -51,31 +51,31 @@ static void qcvmerror(qc_program *prog, const char *fmt, ...) putchar('\n'); } -qc_program* prog_load(const char *filename) +qc_program* prog_load(const char *filename, bool skipversion) { qc_program *prog; prog_header header; - FILE *file = file_open(filename, "rb"); + FILE *file = fs_file_open(filename, "rb"); 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; } - if (header.version != 6) { + 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)); if (!prog) { - file_close(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)); @@ -90,11 +90,11 @@ qc_program* prog_load(const char *filename) } #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 +114,7 @@ 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 */ - file_close(file); + fs_file_close(file); /* profile counters */ memset(vec_add(prog->profile, vec_size(prog->code)), 0, sizeof(prog->profile[0]) * vec_size(prog->code)); @@ -199,7 +199,7 @@ qcany* prog_getedict(qc_program *prog, qcint e) { if (e >= (qcint)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)); @@ -227,29 +227,24 @@ void prog_free_entity(qc_program *prog, qcint 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)) { 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) +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; - size_t len = strlen(str); size_t at = prog->tempstring_at; @@ -359,7 +354,7 @@ 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(stdout, spaces); spaces[sizeof(spaces)-1-len] = ' '; } } @@ -460,7 +455,6 @@ 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) @@ -614,10 +608,16 @@ const char *type_name[TYPE_COUNT] = { "field", "function", "pointer", -#if 0 "integer", -#endif - "variant" + + "variant", + + "struct", + "union", + "array", + + "nil", + "noexpr" }; typedef struct { @@ -625,12 +625,12 @@ 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; \ } \ @@ -659,7 +659,7 @@ static int qc_print(qc_program *prog) static int qc_error(qc_program *prog) { - printf("*** VM raised an error:\n"); + fprintf(stderr, "*** VM raised an error:\n"); qc_print(prog); prog->vmerror++; return -1; @@ -672,7 +672,7 @@ static int qc_ftos(qc_program *prog) qcany 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; @@ -684,7 +684,7 @@ static int qc_stof(qc_program *prog) qcany 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; } @@ -696,7 +696,7 @@ static int qc_vtos(qc_program *prog) qcany 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; @@ -709,7 +709,7 @@ static int qc_etos(qc_program *prog) qcany 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; @@ -733,6 +733,16 @@ static int qc_kill(qc_program *prog) return 0; } +static int qc_sqrt(qc_program *prog) +{ + qcany *num, out; + CheckArgs(1); + num = GetArg(0); + out._float = sqrt(num->_float); + Return(out); + return 0; +} + static int qc_vlen(qc_program *prog) { qcany *vec, len; @@ -745,6 +755,27 @@ static int qc_vlen(qc_program *prog) return 0; } +static int qc_normalize(qc_program *prog) +{ + double len; + qcany *vec; + qcany 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 *prog) { char *buffer; @@ -776,7 +807,7 @@ static int qc_strcmp(qc_program *prog) qcany out; if (prog->argc != 2 && prog->argc != 3) { - printf("ERROR: invalid number of arguments for strcmp/strncmp: %i, expected 2 or 3\n", + fprintf(stderr, "ERROR: invalid number of arguments for strcmp/strncmp: %i, expected 2 or 3\n", prog->argc); return -1; } @@ -793,19 +824,32 @@ static int qc_strcmp(qc_program *prog) return 0; } +static int qc_floor(qc_program *prog) +{ + qcany *num, out; + CheckArgs(1); + num = GetArg(0); + out._float = floor(num->_float); + Return(out); + return 0; +} + static prog_builtin 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_strcat, /* 10 */ - &qc_strcmp /* 11 */ + &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 */ }; static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]); @@ -873,7 +917,7 @@ 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; } } @@ -1018,7 +1062,7 @@ int main(int argc, char **argv) } else if (argv[1][0] != '-') { if (progsfile) { - printf("only 1 program file may be specified\n"); + fprintf(stderr, "only 1 program file may be specified\n"); usage(); exit(1); } @@ -1028,7 +1072,7 @@ int main(int argc, char **argv) } else { - printf("unknown parameter: %s\n", argv[1]); + fprintf(stderr, "unknown parameter: %s\n", argv[1]); usage(); exit(1); } @@ -1041,14 +1085,14 @@ int main(int argc, char **argv) } if (!progsfile) { - printf("must specify a program to execute\n"); + fprintf(stderr, "must specify a program to execute\n"); usage(); exit(1); } - prog = prog_load(progsfile); + prog = prog_load(progsfile, noexec); if (!prog) { - printf("failed to load program '%s'\n", progsfile); + fprintf(stderr, "failed to load program '%s'\n", progsfile); exit(1); } @@ -1094,11 +1138,33 @@ int main(int argc, char **argv) } if (opts_printdefs) { 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*)(prog->globals + prog->defs[i].offset))->_float); + break; + case TYPE_INTEGER: + printf(" [init: %i]", (int)( ((qcany*)(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 )); + break; + case TYPE_STRING: + printf(" [init: `%s`]", prog_getstring(prog, ((qcany*)(prog->globals + prog->defs[i].offset))->string )); + break; + default: + break; + } + } + printf("\n"); } } if (opts_printfields) { @@ -1159,7 +1225,7 @@ 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); @@ -1248,15 +1314,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 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 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; @@ -1362,9 +1434,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*)( ((qcint*)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: