X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=pr_execprogram.h;h=e8886c53c12c918f0b086d225b6178a2a4d8ee07;hb=40453f3c58be439a5bafff7b1916b93aa049a986;hp=4c2001eee276a8e924780d9a2d91d112d0fe39e1;hpb=388e451d83591828bf5873600443c86c74d6726a;p=xonotic%2Fdarkplaces.git diff --git a/pr_execprogram.h b/pr_execprogram.h index 4c2001ee..e8886c53 100644 --- a/pr_execprogram.h +++ b/pr_execprogram.h @@ -6,12 +6,20 @@ st++; if (++profile > 10000000) // LordHavoc: increased runaway loop limit 100x { + // LordHavoc: update profile counter for debugging reasons + // (identifying erroneous loops and recursion patterns) + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + // update the statement number before we error out pr_xstatement = st - pr_statements; - Host_Error ("runaway loop error"); + Host_Error("runaway loop counter hit limit of %d opcodes\ntip: if having trouble identifying the problem, try typing profile now", profile); } #if PRTRACE - PR_PrintStatement (st); + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + PR_PrintStatement(st); #endif switch (st->op) @@ -82,7 +90,7 @@ OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2]; break; case OP_NOT_S: - OPC->_float = !OPA->string || !*PR_GetString(OPA->string); + OPC->_float = !OPA->string || !*PRVM_GetString(OPA->string); break; case OP_NOT_FNC: OPC->_float = !OPA->function; @@ -97,7 +105,7 @@ OPC->_float = (OPA->vector[0] == OPB->vector[0]) && (OPA->vector[1] == OPB->vector[1]) && (OPA->vector[2] == OPB->vector[2]); break; case OP_EQ_S: - OPC->_float = !strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string)); + OPC->_float = !strcmp(PRVM_GetString(OPA->string),PRVM_GetString(OPB->string)); break; case OP_EQ_E: OPC->_float = OPA->_int == OPB->_int; @@ -112,7 +120,7 @@ OPC->_float = (OPA->vector[0] != OPB->vector[0]) || (OPA->vector[1] != OPB->vector[1]) || (OPA->vector[2] != OPB->vector[2]); break; case OP_NE_S: - OPC->_float = strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string)); + OPC->_float = strcmp(PRVM_GetString(OPA->string),PRVM_GetString(OPB->string)); break; case OP_NE_E: OPC->_float = OPA->_int != OPB->_int; @@ -143,45 +151,54 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int); + Host_Error("Progs attempted to write to an out of bounds edict (%i)", OPB->_int); return; } #endif - ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int); + ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int); ptr->_int = OPA->_int; break; case OP_STOREP_V: #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int); + Host_Error("Progs attempted to write to an out of bounds edict (%i)", OPB->_int); return; } #endif - ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int); + ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int); ptr->vector[0] = OPA->vector[0]; ptr->vector[1] = OPA->vector[1]; ptr->vector[2] = OPA->vector[2]; break; case OP_ADDRESS: - pr_xstatement = st - pr_statements; #if PRBOUNDSCHECK if ((unsigned int)(OPB->_int) >= (unsigned int)(progs->entityfields)) { - Host_Error("Progs attempted to address an invalid field (%i) in an edict\n", OPB->_int); + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + Host_Error("Progs attempted to address an invalid field (%i) in an edict", OPB->_int); return; } #endif if (OPA->edict == 0 && sv.state == ss_active) { - Host_Error ("assignment to world entity"); + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + Host_Error("assignment to world entity"); return; } - ed = PROG_TO_EDICT(OPA->edict); - OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)sv.edictsfields; + ed = PRVM_PROG_TO_EDICT(OPA->edict); + OPC->_int = (unsigned char *)((int *)ed->v + OPB->_int) - (unsigned char *)prog->edictsfields; break; case OP_LOAD_F: @@ -189,31 +206,35 @@ case OP_LOAD_ENT: case OP_LOAD_S: case OP_LOAD_FNC: - pr_xstatement = st - pr_statements; #if PRBOUNDSCHECK if ((unsigned int)(OPB->_int) >= (unsigned int)(progs->entityfields)) { - Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int); + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + Host_Error("Progs attempted to read an invalid field in an edict (%i)", OPB->_int); return; } #endif - ed = PROG_TO_EDICT(OPA->edict); - OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int; + ed = PRVM_PROG_TO_EDICT(OPA->edict); + OPC->_int = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->_int; break; case OP_LOAD_V: - pr_xstatement = st - pr_statements; #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 2 >= progs->entityfields) { - Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int); + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + Host_Error("Progs attempted to read an invalid field in an edict (%i)", OPB->_int); return; } #endif - ed = PROG_TO_EDICT(OPA->edict); - OPC->vector[0] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[0]; - OPC->vector[1] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[1]; - OPC->vector[2] = ((eval_t *)((int *)ed->v + OPB->_int))->vector[2]; + ed = PRVM_PROG_TO_EDICT(OPA->edict); + OPC->vector[0] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[0]; + OPC->vector[1] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[1]; + OPC->vector[2] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[2]; break; //================== @@ -245,10 +266,13 @@ startprofile = profile; pr_xstatement = st - pr_statements; pr_argc = st->op - OP_CALL0; - if (!OPA->function) - Host_Error ("NULL function"); + if (!OPA->function ) + Host_Error("NULL function"); + else if (OPA->function > (unsigned) progs->numfunctions) + Host_Error("Bad function number"); - newf = &pr_functions[OPA->function]; + newf = &prog->functions[OPA->function]; + newf->callcount++; if (newf->first_statement < 0) { @@ -256,16 +280,22 @@ int builtinnumber = -newf->first_statement; pr_xfunction->builtinsprofile++; if (builtinnumber < pr_numbuiltins && pr_builtins[builtinnumber]) - pr_builtins[builtinnumber] (); + pr_builtins[builtinnumber](); else - Host_Error ("No such builtin #%i", builtinnumber); + Host_Error("No such builtin #%i", builtinnumber); } else st = pr_statements + PR_EnterFunction(newf); + if (pr_trace != cachedpr_trace) + goto chooseexecprogram; break; case OP_DONE: case OP_RETURN: + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + pr_globals[OFS_RETURN] = pr_globals[(unsigned short) st->a]; pr_globals[OFS_RETURN+1] = pr_globals[(unsigned short) st->a+1]; pr_globals[OFS_RETURN+2] = pr_globals[(unsigned short) st->a+2]; @@ -278,10 +308,13 @@ break; case OP_STATE: - ed = PROG_TO_EDICT(pr_global_struct->self); - ed->v->nextthink = pr_global_struct->time + 0.1; - ed->v->frame = OPA->_float; - ed->v->think = OPB->function; + pr_xfunction->profile += profile - startprofile; + startprofile = profile; + pr_xstatement = st - pr_statements; + ed = PRVM_PROG_TO_EDICT(prog->globals.server->self); + ed->fields.server->nextthink = prog->globals.server->time + 0.1; + ed->fields.server->frame = OPA->_float; + ed->fields.server->think = OPB->function; break; // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized @@ -441,31 +474,37 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to write to an out of bounds edict\n"); + Host_Error("Progs attempted to write to an out of bounds edict"); return; } #endif - ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int); + ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int); ptr->_int = OPA->_int; break; case OP_LOAD_I: #if PRBOUNDSCHECK if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to read an out of bounds edict number\n"); + Host_Error("Progs attempted to read an out of bounds edict number"); return; } if (OPB->_int < 0 || OPB->_int >= progs->entityfields) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to read an invalid field in an edict\n"); + Host_Error("Progs attempted to read an invalid field in an edict"); return; } #endif - ed = PROG_TO_EDICT(OPA->edict); - OPC->_int = ((eval_t *)((int *)ed->v + OPB->_int))->_int; + ed = PRVM_PROG_TO_EDICT(OPA->edict); + OPC->_int = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->_int; break; case OP_GSTOREP_I: @@ -477,8 +516,10 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int >= pr_globaldefs) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to write to an invalid indexed global\n"); + Host_Error("Progs attempted to write to an invalid indexed global"); return; } #endif @@ -488,8 +529,10 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to write to an invalid indexed global\n"); + Host_Error("Progs attempted to write to an invalid indexed global"); return; } #endif @@ -503,8 +546,10 @@ #if PRBOUNDSCHECK if (i < 0 || i >= pr_globaldefs) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to address an out of bounds global\n"); + Host_Error("Progs attempted to address an out of bounds global"); return; } #endif @@ -520,8 +565,10 @@ #if PRBOUNDSCHECK if (OPA->_int < 0 || OPA->_int >= pr_globaldefs) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to read an invalid indexed global\n"); + Host_Error("Progs attempted to read an invalid indexed global"); return; } #endif @@ -532,8 +579,10 @@ #if PRBOUNDSCHECK if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs attempted to read an invalid indexed global\n"); + Host_Error("Progs attempted to read an invalid indexed global"); return; } #endif @@ -545,8 +594,10 @@ case OP_BOUNDCHECK: if (OPA->_int < 0 || OPA->_int >= st->b) { + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; - Host_Error("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c); + Host_Error("Progs boundcheck failed at line number %d, value is < 0 or >= %d", st->b, st->c); return; } break; @@ -554,6 +605,8 @@ */ default: + pr_xfunction->profile += profile - startprofile; + startprofile = profile; pr_xstatement = st - pr_statements; Host_Error ("Bad opcode %i", st->op); }