X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=exec.c;h=2e1f58d476baf9f99c622153dcfaa5093b884505;hb=fe3b1b2e8d5e8672e6a15ccb476a1fecc6f30ff7;hp=c65c6e2d2edfb590754eaf515f6ec3c06308ec2d;hpb=48d330a1e9271dbd59564469fb4ce90d84f84f24;p=xonotic%2Fgmqcc.git diff --git a/exec.c b/exec.c index c65c6e2..2e1f58d 100644 --- a/exec.c +++ b/exec.c @@ -1,4 +1,5 @@ #include +#include #include #include @@ -13,6 +14,7 @@ MEM_VEC_FUN_APPEND(qc_program, char, strings) MEM_VEC_FUN_RESIZE(qc_program, char, strings) MEM_VEC_FUNCTIONS(qc_program, qcint, globals) MEM_VEC_FUNCTIONS(qc_program, qcint, entitydata) +MEM_VEC_FUNCTIONS(qc_program, bool, entitypool) MEM_VEC_FUNCTIONS(qc_program, qcint, localstack) MEM_VEC_FUN_APPEND(qc_program, qcint, localstack) @@ -34,13 +36,26 @@ static void loaderror(const char *fmt, ...) printf(": %s\n", strerror(err)); } +static void qcvmerror(qc_program *prog, const char *fmt, ...) +{ + va_list ap; + + prog->vmerror++; + + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + putchar('\n'); +} + qc_program* prog_load(const char *filename) { qc_program *prog; prog_header header; + size_t i; FILE *file; - file = fopen(filename, "rb"); + file = util_fopen(filename, "rb"); if (!file) return NULL; @@ -108,6 +123,19 @@ qc_program* prog_load(const char *filename) if (!qc_program_strings_resize(prog, prog->strings_count + 16*1024)) goto error; + /* spawn the world entity */ + if (!qc_program_entitypool_add(prog, true)) { + loaderror("failed to allocate world entity\n"); + goto error; + } + for (i = 0; i < prog->entityfields; ++i) { + if (!qc_program_entitydata_add(prog, 0)) { + loaderror("failed to allocate world data\n"); + goto error; + } + } + prog->entities = 1; + return prog; error: @@ -119,6 +147,7 @@ error: if (prog->strings) mem_d(prog->strings); if (prog->globals) mem_d(prog->globals); if (prog->entitydata) mem_d(prog->entitydata); + if (prog->entitypool) mem_d(prog->entitypool); mem_d(prog); return NULL; } @@ -133,6 +162,7 @@ void prog_delete(qc_program *prog) MEM_VECTOR_CLEAR(prog, strings); MEM_VECTOR_CLEAR(prog, globals); MEM_VECTOR_CLEAR(prog, entitydata); + MEM_VECTOR_CLEAR(prog, entitypool); MEM_VECTOR_CLEAR(prog, localstack); MEM_VECTOR_CLEAR(prog, stack); MEM_VECTOR_CLEAR(prog, profile); @@ -177,7 +207,58 @@ prog_section_def* prog_getdef(qc_program *prog, qcint off) qcany* prog_getedict(qc_program *prog, qcint e) { - return (qcany*)(prog->entitydata + (prog->entityfields + e)); + if (e >= prog->entitypool_count) { + prog->vmerror++; + printf("Accessing out of bounds edict %i\n", (int)e); + e = 0; + } + return (qcany*)(prog->entitydata + (prog->entityfields * e)); +} + +qcint prog_spawn_entity(qc_program *prog) +{ + size_t i; + qcint e; + for (e = 0; e < (qcint)prog->entitypool_count; ++e) { + if (!prog->entitypool[e]) { + char *data = (char*)(prog->entitydata + (prog->entityfields * e)); + memset(data, 0, prog->entityfields * sizeof(qcint)); + return e; + } + } + if (!qc_program_entitypool_add(prog, true)) { + prog->vmerror++; + printf("Failed to allocate entity\n"); + return 0; + } + prog->entities++; + for (i = 0; i < prog->entityfields; ++i) { + if (!qc_program_entitydata_add(prog, 0)) { + printf("Failed to allocate entity\n"); + return 0; + } + } + return e; +} + +void prog_free_entity(qc_program *prog, qcint e) +{ + if (!e) { + prog->vmerror++; + printf("Trying to free world entity\n"); + return; + } + if (e >= prog->entitypool_count) { + prog->vmerror++; + printf("Trying to free out of bounds entity\n"); + return; + } + if (!prog->entitypool[e]) { + prog->vmerror++; + printf("Double free on entity\n"); + return; + } + prog->entitypool[e] = false; } qcint prog_tempstring(qc_program *prog, const char *_str) @@ -239,13 +320,15 @@ static int print_escaped_string(const char *str) static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) { - static char spaces[16+1] = " "; + static char spaces[40+1] = " "; prog_section_def *def; qcany *value; int len; - if (!glob) - return; + if (!glob) { + len = printf(","); + goto done; + } def = prog_getdef(prog, glob); value = (qcany*)(&prog->globals[glob]); @@ -272,6 +355,7 @@ static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) break; case TYPE_STRING: len += print_escaped_string(prog_getstring(prog, value->string)); + len += printf(","); /* len += printf("\"%s\",", prog_getstring(prog, value->string)); */ break; case TYPE_FLOAT: @@ -279,10 +363,11 @@ static void trace_print_global(qc_program *prog, unsigned int glob, int vtype) len += printf("%g,", value->_float); break; } - if (len < 16) { - spaces[16-len] = 0; +done: + if (len < sizeof(spaces)-1) { + spaces[sizeof(spaces)-1-len] = 0; printf(spaces); - spaces[16-len] = ' '; + spaces[sizeof(spaces)-1-len] = ' '; } } @@ -332,18 +417,50 @@ static void prog_print_statement(qc_program *prog, prog_section_statement *st) case INSTR_NE_S: t[0] = t[1] = TYPE_STRING; break; + case INSTR_STORE_F: + case INSTR_STOREP_F: + t[2] = -1; + break; case INSTR_STORE_V: t[0] = t[1] = TYPE_VECTOR; t[2] = -1; break; case INSTR_STORE_S: t[0] = t[1] = TYPE_STRING; t[2] = -1; break; + case INSTR_STORE_ENT: + t[0] = t[1] = TYPE_ENTITY; t[2] = -1; + break; + case INSTR_STORE_FLD: + t[0] = t[1] = TYPE_FIELD; t[2] = -1; + break; + case INSTR_STORE_FNC: + t[0] = t[1] = TYPE_FUNCTION; t[2] = -1; + break; + case INSTR_STOREP_V: + t[0] = TYPE_VECTOR; t[1] = TYPE_ENTITY; t[2] = -1; + break; + case INSTR_STOREP_S: + t[0] = TYPE_STRING; t[1] = TYPE_ENTITY; t[2] = -1; + break; + case INSTR_STOREP_ENT: + t[0] = TYPE_ENTITY; t[1] = TYPE_ENTITY; t[2] = -1; + break; + case INSTR_STOREP_FLD: + t[0] = TYPE_FIELD; t[1] = TYPE_ENTITY; t[2] = -1; + break; + case INSTR_STOREP_FNC: + t[0] = TYPE_FUNCTION; t[1] = TYPE_ENTITY; t[2] = -1; + break; } if (t[0] >= 0) trace_print_global(prog, st->o1.u1, t[0]); + else printf("(none), "); if (t[1] >= 0) trace_print_global(prog, st->o2.u1, t[1]); + else printf("(none), "); if (t[2] >= 0) trace_print_global(prog, st->o3.u1, t[2]); + else printf("(none)"); printf("\n"); } + fflush(stdout); } static qcint prog_enterfunction(qc_program *prog, prog_section_function *func) @@ -431,7 +548,7 @@ static qcint prog_leavefunction(qc_program *prog) exit(1); } - return st.stmt; + return st.stmt - 1; /* offset the ++st */ } bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps) @@ -439,6 +556,8 @@ bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long long jumpcount = 0; prog_section_statement *st; + prog->vmerror = 0; + st = prog->code + prog_enterfunction(prog, func); --st; switch (flags) @@ -477,6 +596,8 @@ bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long cleanup: prog->localstack_count = 0; prog->stack_count = 0; + if (prog->vmerror) + return false; return true; } @@ -488,30 +609,105 @@ cleanup: bool opts_debug = false; bool opts_memchk = false; +#define CheckArgs(num) do { \ + if (prog->argc != (num)) { \ + prog->vmerror++; \ + printf("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 GetArg(num) GetGlobal(OFS_PARM0 + 3*(num)) +#define Return(any) *(GetGlobal(OFS_RETURN)) = (any) + static int qc_print(qc_program *prog) { - qcany *str = (qcany*)(prog->globals + OFS_PARM0); - printf("%s", prog_getstring(prog, str->string)); + size_t i; + for (i = 0; i < prog->argc; ++i) { + qcany *str = (qcany*)(prog->globals + OFS_PARM0 + 3*i); + printf("%s", prog_getstring(prog, str->string)); + } + return 0; +} + +static int qc_ftos(qc_program *prog) +{ + char buffer[512]; + qcany *num; + qcany str; + CheckArgs(1); + num = GetArg(0); + snprintf(buffer, sizeof(buffer), "%g", num->_float); + str.string = prog_tempstring(prog, buffer); + Return(str); + return 0; +} + +static int qc_spawn(qc_program *prog) +{ + qcany 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; + CheckArgs(1); + ent = GetArg(0); + prog_free_entity(prog, ent->edict); return 0; } static prog_builtin qc_builtins[] = { NULL, - &qc_print + &qc_print, + &qc_ftos, + &qc_spawn, + &qc_kill }; static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]); +static const char *arg0 = NULL; + +void usage() +{ + printf("usage: [-debug] %s file\n", arg0); + exit(1); +} + int main(int argc, char **argv) { size_t i; qcint fnmain = -1; qc_program *prog; + size_t xflags = VMXF_DEFAULT; - if (argc != 2) { - printf("usage: %s file\n", argv[0]); - exit(1); + arg0 = argv[0]; + + if (argc < 2) + usage(); + + while (argc > 2) { + if (!strcmp(argv[1], "-trace")) { + --argc; + ++argv; + xflags |= VMXF_TRACE; + } + else if (!strcmp(argv[1], "-profile")) { + --argc; + ++argv; + xflags |= VMXF_PROFILE; + } + else + usage(); } + prog = prog_load(argv[1]); if (!prog) { printf("failed to load program '%s'\n", argv[1]); @@ -524,13 +720,14 @@ int main(int argc, char **argv) for (i = 1; i < prog->functions_count; ++i) { const char *name = prog_getstring(prog, prog->functions[i].name); - printf("Found function: %s\n", name); + /* printf("Found function: %s\n", name); */ if (!strcmp(name, "main")) fnmain = (qcint)i; } + printf("Entity field space: %i\n", (int)prog->entityfields); if (fnmain > 0) { - prog_exec(prog, &prog->functions[fnmain], VMXF_TRACE, VM_JUMPS_DEFAULT); + prog_exec(prog, &prog->functions[fnmain], xflags, VM_JUMPS_DEFAULT); } else printf("No main function found\n");