X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=4d872f64bf4e72c09d0afba93c0910e6b24aa488;hb=8b0fbc64175362acf3ea872029a423012b76a4f8;hp=3439affa82046866184eb6572cea685d464e70ad;hpb=29de7088f191d21a0c7dd5396cb5cead032c2ac2;p=xonotic%2Fdarkplaces.git diff --git a/prvm_execprogram.h b/prvm_execprogram.h index 3439affa..4d872f64 100644 --- a/prvm_execprogram.h +++ b/prvm_execprogram.h @@ -1,25 +1,25 @@ +#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. while (1) { st++; - if (++profile > 10000000) // LordHavoc: increased runaway loop limit 100x - { - // LordHavoc: update profile counter for debugging reasons - // (identifying erroneous loops and recursion patterns) - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - // update the statement number before we error out - prog->xstatement = st - prog->statements; - PRVM_ERROR("runaway loop counter hit limit of %d opcodes\ntip: if having trouble identifying the problem, try typing profile now in %s", profile, PRVM_NAME); - } -#if PRVMTRACE - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - PRVM_PrintStatement(st); +#if PRVMSLOWINTERPRETER + if (prog->trace) + PRVM_PrintStatement(st); + prog->statement_profile[st - prog->statements]++; #endif switch (st->op) @@ -57,7 +57,21 @@ OPC->vector[2] = OPB->_float * OPA->vector[2]; break; case OP_DIV_F: - OPC->_float = OPA->_float / OPB->_float; + if( OPB->_float != 0.0f ) + { + OPC->_float = OPA->_float / OPB->_float; + } + else + { + if (developer.integer) + { + prog->xfunction->profile += (st - startst); + startst = st; + prog->xstatement = st - prog->statements; + VM_Warning( "Attempted division by zero in %s\n", PRVM_NAME ); + } + OPC->_float = 0.0f; + } break; case OP_BITAND: OPC->_float = (int)OPA->_float & (int)OPB->_float; @@ -78,19 +92,19 @@ OPC->_float = OPA->_float < OPB->_float; break; case OP_AND: - OPC->_float = OPA->_float && OPB->_float; + OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) && FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add AND_I to be used by fteqcc for anything not a float break; case OP_OR: - OPC->_float = OPA->_float || OPB->_float; + OPC->_float = FLOAT_IS_TRUE_FOR_INT(OPA->_int) || FLOAT_IS_TRUE_FOR_INT(OPB->_int); // TODO change this back to float, and add OR_I to be used by fteqcc for anything not a float break; case OP_NOT_F: - OPC->_float = !OPA->_float; + OPC->_float = !FLOAT_IS_TRUE_FOR_INT(OPA->_int); break; case OP_NOT_V: 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; @@ -148,57 +162,61 @@ case OP_STOREP_FLD: // integers case OP_STOREP_S: case OP_STOREP_FNC: // pointers -#if PRVMBOUNDSCHECK - if (OPB->_int < 0 || OPB->_int + 4 > prog->edictareasize) + if (OPB->_int < 0 || OPB->_int + 1 > prog->entityfieldsarea) + { + PreError(); + PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); + goto cleanup; + } + if (OPB->_int < prog->entityfields && !prog->allowworldwrites) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; prog->xstatement = st - prog->statements; - PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int); - return; + VM_Warning("assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); } -#endif - ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int); + 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 + 12 > prog->edictareasize) + if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfieldsarea) + { + PreError(); + PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); + goto cleanup; + } + if (OPB->_int < prog->entityfields && !prog->allowworldwrites) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; prog->xstatement = st - prog->statements; - PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int); - return; + VM_Warning("assignment to world.%s (field %i) in %s\n", PRVM_GetString(PRVM_ED_FieldAtOfs(OPB->_int)->s_name), OPB->_int, PRVM_NAME); } -#endif - ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int); - ptr->vector[0] = OPA->vector[0]; - ptr->vector[1] = OPA->vector[1]; - ptr->vector[2] = OPA->vector[2]; + ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int); + ptr->ivector[0] = OPA->ivector[0]; + ptr->ivector[1] = OPA->ivector[1]; + ptr->ivector[2] = OPA->ivector[2]; break; case OP_ADDRESS: -#if PRVMBOUNDSCHECK - if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields)) + if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict\n", PRVM_NAME, OPB->_int); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME); + goto cleanup; } -#endif - /*if (OPA->edict == 0 && sv.state == ss_active) + if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields)) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - Host_Error("assignment to world entity in %s", PRVM_NAME); - return; - }*/ + PreError(); + PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int); + goto cleanup; + } +#if 0 + if (OPA->edict == 0 && !prog->allowworldwrites) + { + PreError(); + PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME); + goto cleanup; + } +#endif ed = PRVM_PROG_TO_EDICT(OPA->edict); - OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)prog->edictsfields; + OPC->_int = ed->fields.vp - prog->edictsfields + OPB->_int; break; case OP_LOAD_F: @@ -206,51 +224,92 @@ case OP_LOAD_ENT: case OP_LOAD_S: case OP_LOAD_FNC: -#if PRVMBOUNDSCHECK - if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields)) + if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int); - return; + 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->entityfields)) + { + 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 = ((eval_t *)((int *)ed->v + OPB->_int))->_int; + OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int; break; case OP_LOAD_V: -#if PRVMBOUNDSCHECK - if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields) + if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int); - return; + 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->entityfields) + { + 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->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]; + 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]; + OPC->ivector[2] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[2]; break; //================== case OP_IFNOT: - if (!OPA->_int) - st += st->b - 1; // offset the s++ + if(!FLOAT_IS_TRUE_FOR_INT(OPA->_int)) + // TODO add an "int-if", and change this one to OPA->_float + // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero) + // and entity, string, field values can never have that value + { + prog->xfunction->profile += (st - startst); + st = prog->statements + st->jumpabsolute - 1; // offset the st++ + startst = st; + // no bounds check needed, it is done when loading progs + 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); + } + } break; case OP_IF: - if (OPA->_int) - st += st->b - 1; // offset the s++ + if(FLOAT_IS_TRUE_FOR_INT(OPA->_int)) + // TODO add an "int-if", and change this one, as well as the FLOAT_IS_TRUE_FOR_INT usages, to OPA->_float + // although mostly unneeded, thanks to the only float being false being 0x0 and 0x80000000 (negative zero) + // and entity, string, field values can never have that value + { + prog->xfunction->profile += (st - startst); + st = prog->statements + st->jumpabsolute - 1; // offset the st++ + startst = st; + // no bounds check needed, it is done when loading progs + if (++jumpcount == 10000000 && prvm_runawaycheck) + { + prog->xstatement = st - prog->statements; + 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); + } + } break; case OP_GOTO: - st += st->a - 1; // offset the s++ + prog->xfunction->profile += (st - startst); + st = prog->statements + st->jumpabsolute - 1; // offset the st++ + startst = st; + // no bounds check needed, it is done when loading progs + if (++jumpcount == 10000000 && prvm_runawaycheck) + { + prog->xstatement = st - prog->statements; + 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); + } break; case OP_CALL0: @@ -262,14 +321,27 @@ case OP_CALL6: case OP_CALL7: case OP_CALL8: - prog->xfunction->profile += profile - startprofile; - startprofile = profile; +#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; prog->argc = st->op - OP_CALL0; if (!OPA->function) PRVM_ERROR("NULL function in %s", PRVM_NAME); + if(!OPA->function || OPA->function >= (unsigned int)prog->numfunctions) + { + PreError(); + PRVM_ERROR("%s CALL outside the program", PRVM_NAME); + goto cleanup; + } + newf = &prog->functions[OPA->function]; + newf->callcount++; if (newf->first_statement < 0) { @@ -277,46 +349,61 @@ 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", builtinnumber, PRVM_NAME); + PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME); } else st = prog->statements + PRVM_EnterFunction(newf); + startst = st; break; case OP_DONE: case OP_RETURN: - prog->xfunction->profile += profile - startprofile; - startprofile = profile; +#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[OFS_RETURN] = prog->globals[(unsigned short) st->a]; - prog->globals[OFS_RETURN+1] = prog->globals[(unsigned short) st->a+1]; - prog->globals[OFS_RETURN+2] = prog->globals[(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; if (prog->depth <= exitdepth) - return; // all done + goto cleanup; // all done if (prog->trace != cachedpr_trace) goto chooseexecprogram; break; case OP_STATE: - if(prog->flag & PRVM_OP_STATE) + if(prog->flag & PRVM_OP_STATE) { - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - ed = PRVM_PROG_TO_EDICT(PRVM_G_INT(prog->self->ofs)); - PRVM_E_FLOAT(ed,PRVM_ED_FindFieldOffset ("nextthink")) = PRVM_G_FLOAT(PRVM_ED_FindGlobal("time")->ofs*4) + 0.1; - PRVM_E_FLOAT(ed,PRVM_ED_FindFieldOffset ("frame")) = OPA->_float; - *(func_t *)((qbyte*)ed->v + PRVM_ED_FindFieldOffset ("think")) = OPB->function; + ed = PRVM_PROG_TO_EDICT(PRVM_gameglobaledict(self)); + PRVM_gameedictfloat(ed,nextthink) = PRVM_gameglobalfloat(time) + 0.1; + PRVM_gameedictfloat(ed,frame) = OPA->_float; + PRVM_gameedictfunction(ed,think) = OPB->function; } else - PRVM_ERROR("OP_STATE not supported by %s\n", PRVM_NAME); + { + PreError(); + prog->xstatement = st - prog->statements; + PRVM_ERROR("OP_STATE not supported by %s", PRVM_NAME); + } break; - + // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized /* case OP_ADD_I: @@ -474,37 +561,31 @@ #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to write to an out of bounds edict", PRVM_NAME); + goto cleanup; } #endif - ptr = (eval_t *)((qbyte *)sv.edictsfields + OPB->_int); + ptr = (prvm_eval_t *)(prog->edictsfields + OPB->_int); ptr->_int = OPA->_int; break; case OP_LOAD_I: #if PRBOUNDSCHECK - if (OPA->edict < 0 || OPA->edict >= pr_edictareasize) + if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { - 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"); - return; + 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) { - 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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to read an invalid field in an edict", PRVM_NAME); + goto cleanup; } #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: @@ -516,29 +597,25 @@ #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); + goto cleanup; } #endif - pr_globals[OPB->_int] = OPA->_float; + pr_iglobals[OPB->_int] = OPA->_int; break; case OP_GSTOREP_V: #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); + goto cleanup; } #endif - pr_globals[OPB->_int ] = OPA->vector[0]; - pr_globals[OPB->_int+1] = OPA->vector[1]; - pr_globals[OPB->_int+2] = OPA->vector[2]; + pr_iglobals[OPB->_int ] = OPA->ivector[0]; + pr_iglobals[OPB->_int+1] = OPA->ivector[1]; + pr_iglobals[OPB->_int+2] = OPA->ivector[2]; break; case OP_GADDRESS: @@ -546,14 +623,12 @@ #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME); + goto cleanup; } #endif - OPC->_float = pr_globals[i]; + OPC->_int = pr_iglobals[i]; break; case OP_GLOAD_I: @@ -565,50 +640,44 @@ #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); + goto cleanup; } #endif - OPC->_float = pr_globals[OPA->_int]; + OPC->_int = pr_iglobals[OPA->_int]; break; case OP_GLOAD_V: #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"); - return; + PreError(); + PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); + goto cleanup; } #endif - OPC->vector[0] = pr_globals[OPA->_int ]; - OPC->vector[1] = pr_globals[OPA->_int+1]; - OPC->vector[2] = pr_globals[OPA->_int+2]; + OPC->ivector[0] = pr_iglobals[OPA->_int ]; + OPC->ivector[1] = pr_iglobals[OPA->_int+1]; + OPC->ivector[2] = pr_iglobals[OPA->_int+2]; break; 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); - return; + PreError(); + PRVM_ERROR ("%s Progs boundcheck failed at line number %d, value is < 0 or >= %d", PRVM_NAME, st->b, st->c); + goto cleanup; } break; */ default: - prog->xfunction->profile += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; + PreError(); PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME); + goto cleanup; } } +#undef PreError