X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=447ee784702642c9dd9db195370bb7e58200c92e;hb=9e0b57e36ca8bb835c2f49901b4493b1f3b5625a;hp=99666756ba90ea59a495173026baeaf8296f562c;hpb=d39861bfe72a5a9ec8cfbcc83457db58a74b75d9;p=xonotic%2Fdarkplaces.git diff --git a/prvm_execprogram.h b/prvm_execprogram.h index 99666756..447ee784 100644 --- a/prvm_execprogram.h +++ b/prvm_execprogram.h @@ -1,3 +1,14 @@ +#ifdef PRVMTIMEPROFILING +#define PreError() \ + prog->xstatement = st - prog->statements; \ + tm = Sys_DoubleTime(); \ + prog->xfunction->profile += (st - startst); \ + prog->xfunction->tprofile += (tm - starttm); +#else +#define PreError() \ + prog->xstatement = st - prog->statements; \ + prog->xfunction->profile += (st - startst); +#endif // This code isn't #ifdef/#define protectable, don't try. @@ -5,10 +16,9 @@ { st++; -#if PRVMTRACE - PRVM_PrintStatement(st); -#endif -#if PRVMSTATEMENTPROFILING +#if PRVMSLOWINTERPRETER + if (prog->trace) + PRVM_PrintStatement(st); prog->statement_profile[st - prog->statements]++; #endif @@ -152,32 +162,32 @@ case OP_STOREP_FLD: // integers case OP_STOREP_S: case OP_STOREP_FNC: // pointers -#if PRVMBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 1 > prog->entityfieldsarea) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); goto cleanup; } -#endif - if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites) - Con_DPrintf("WARNING: assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); + if (OPB->_int < prog->entityfields && !prog->allowworldwrites) + { + prog->xstatement = st - prog->statements; + VM_Warning("assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); + } ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int); ptr->_int = OPA->_int; break; case OP_STOREP_V: -#if PRVMBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfieldsarea) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); goto cleanup; } -#endif - if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites) - Con_DPrintf("WARNING: assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); + if (OPB->_int < prog->entityfields && !prog->allowworldwrites) + { + prog->xstatement = st - prog->statements; + VM_Warning("assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); + } ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int); ptr->ivector[0] = OPA->ivector[0]; ptr->ivector[1] = OPA->ivector[1]; @@ -185,27 +195,22 @@ break; case OP_ADDRESS: -#if PRVMBOUNDSCHECK if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME); goto cleanup; } - if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields)) + if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields)) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int); goto cleanup; } -#endif #if 0 if (OPA->edict == 0 && !prog->allowworldwrites) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME); goto cleanup; } @@ -219,43 +224,35 @@ case OP_LOAD_ENT: case OP_LOAD_S: case OP_LOAD_FNC: -#if PRVMBOUNDSCHECK if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); goto cleanup; } - if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields)) + if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields)) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int); goto cleanup; } -#endif ed = PRVM_PROG_TO_EDICT(OPA->edict); OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int; break; case OP_LOAD_V: -#if PRVMBOUNDSCHECK if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); goto cleanup; } - if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields) + if (OPB->_int < 0 || OPB->_int + 2 >= prog->entityfields) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int); goto cleanup; } -#endif ed = PRVM_PROG_TO_EDICT(OPA->edict); OPC->ivector[0] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[0]; OPC->ivector[1] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[1]; @@ -271,17 +268,15 @@ // and entity, string, field values can never have that value { prog->xfunction->profile += (st - startst); - st += st->b - 1; // offset the s++ + st = prog->statements + st->jumpabsolute - 1; // offset the st++ startst = st; // no bounds check needed, it is done when loading progs -#if PRVMRUNAWAYCHECK - if (++jumpcount == 10000000) + if (++jumpcount == 10000000 && prvm_runawaycheck) { prog->xstatement = st - prog->statements; PRVM_Profile(1<<30, 1000000, 0); PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount); } -#endif } break; @@ -292,33 +287,29 @@ // and entity, string, field values can never have that value { prog->xfunction->profile += (st - startst); - st += st->b - 1; // offset the s++ + st = prog->statements + st->jumpabsolute - 1; // offset the st++ startst = st; // no bounds check needed, it is done when loading progs -#if PRVMRUNAWAYCHECK - if (++jumpcount == 10000000) + if (++jumpcount == 10000000 && prvm_runawaycheck) { prog->xstatement = st - prog->statements; - PRVM_Profile(1<<30, 1000000, 0); + PRVM_Profile(1<<30, 0.01, 0); PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount); } -#endif } break; case OP_GOTO: prog->xfunction->profile += (st - startst); - st += st->a - 1; // offset the s++ + st = prog->statements + st->jumpabsolute - 1; // offset the st++ startst = st; // no bounds check needed, it is done when loading progs -#if PRVMRUNAWAYCHECK - if (++jumpcount == 10000000) + if (++jumpcount == 10000000 && prvm_runawaycheck) { prog->xstatement = st - prog->statements; - PRVM_Profile(1<<30, 1000000, 0); + PRVM_Profile(1<<30, 0.01, 0); PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount); } -#endif break; case OP_CALL0: @@ -330,6 +321,11 @@ case OP_CALL6: case OP_CALL7: case OP_CALL8: +#ifdef PRVMTIMEPROFILING + tm = Sys_DoubleTime(); + prog->xfunction->tprofile += (tm - starttm); + starttm = tm; +#endif prog->xfunction->profile += (st - startst); startst = st; prog->xstatement = st - prog->statements; @@ -337,15 +333,12 @@ if (!OPA->function) PRVM_ERROR("NULL function in %s", PRVM_NAME); -#if PRVMBOUNDSCHECK - if(!OPA->function || OPA->function >= (unsigned int)prog->progs->numfunctions) + if(!OPA->function || OPA->function >= (unsigned int)prog->numfunctions) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; // we better stay on the previously executed statement + PreError(); PRVM_ERROR("%s CALL outside the program", PRVM_NAME); goto cleanup; } -#endif newf = &prog->functions[OPA->function]; newf->callcount++; @@ -356,7 +349,15 @@ int builtinnumber = -newf->first_statement; prog->xfunction->builtinsprofile++; if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber]) + { prog->builtins[builtinnumber](); +#ifdef PRVMTIMEPROFILING + tm = Sys_DoubleTime(); + newf->tprofile += (tm - starttm); + prog->xfunction->tbprofile += (tm - starttm); + starttm = tm; +#endif + } else PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME); } @@ -367,12 +368,17 @@ case OP_DONE: case OP_RETURN: +#ifdef PRVMTIMEPROFILING + tm = Sys_DoubleTime(); + prog->xfunction->tprofile += (tm - starttm); + starttm = tm; +#endif prog->xfunction->profile += (st - startst); prog->xstatement = st - prog->statements; - prog->globals.generic[OFS_RETURN] = prog->globals.generic[(unsigned short) st->a]; - prog->globals.generic[OFS_RETURN+1] = prog->globals.generic[(unsigned short) st->a+1]; - prog->globals.generic[OFS_RETURN+2] = prog->globals.generic[(unsigned short) st->a+2]; + prog->globals.generic[OFS_RETURN] = prog->globals.generic[st->operand[0]]; + prog->globals.generic[OFS_RETURN+1] = prog->globals.generic[st->operand[0]+1]; + prog->globals.generic[OFS_RETURN+2] = prog->globals.generic[st->operand[0]+2]; st = prog->statements + PRVM_LeaveFunction(); startst = st; @@ -385,14 +391,14 @@ case OP_STATE: if(prog->flag & PRVM_OP_STATE) { - ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict); - PRVM_EDICTFIELDVALUE(ed,prog->fieldoffsets.nextthink)->_float = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float + 0.1; - PRVM_EDICTFIELDVALUE(ed,prog->fieldoffsets.frame)->_float = OPA->_float; - PRVM_EDICTFIELDVALUE(ed,prog->fieldoffsets.think)->function = OPB->function; + ed = PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDEDICT(prog->globaloffsets.self)); + PRVM_EDICTFIELDFLOAT(ed,prog->fieldoffsets.nextthink) = PRVM_GLOBALFIELDFLOAT(prog->globaloffsets.time) + 0.1; + PRVM_EDICTFIELDFLOAT(ed,prog->fieldoffsets.frame) = OPA->_float; + PRVM_EDICTFIELDFUNCTION(ed,prog->fieldoffsets.think) = OPB->function; } else { - prog->xfunction->profile += (st - startst); + PreError(); prog->xstatement = st - prog->statements; PRVM_ERROR("OP_STATE not supported by %s", PRVM_NAME); } @@ -555,8 +561,7 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to write to an out of bounds edict", PRVM_NAME); goto cleanup; } @@ -568,15 +573,13 @@ #if PRBOUNDSCHECK if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); goto cleanup; } if (OPB->_int < 0 || OPB->_int >= progs->entityfields) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an invalid field in an edict", PRVM_NAME); goto cleanup; } @@ -594,8 +597,7 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int >= pr_globaldefs) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); goto cleanup; } @@ -606,8 +608,7 @@ #if PRBOUNDSCHECK if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); goto cleanup; } @@ -622,8 +623,7 @@ #if PRBOUNDSCHECK if (i < 0 || i >= pr_globaldefs) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME); goto cleanup; } @@ -640,8 +640,7 @@ #if PRBOUNDSCHECK if (OPA->_int < 0 || OPA->_int >= pr_globaldefs) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); goto cleanup; } @@ -653,8 +652,7 @@ #if PRBOUNDSCHECK if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); goto cleanup; } @@ -667,8 +665,7 @@ case OP_BOUNDCHECK: if (OPA->_int < 0 || OPA->_int >= st->b) { - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("%s Progs boundcheck failed at line number %d, value is < 0 or >= %d", PRVM_NAME, st->b, st->c); goto cleanup; } @@ -677,10 +674,10 @@ */ default: - prog->xfunction->profile += (st - startst); - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME); goto cleanup; } } +#undef PreError