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);
#endif
+#if PRVMSTATEMENTPROFILING
+ prog->statement_profile[st - prog->statements]++;
+#endif
switch (st->op)
{
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 >= 1 )
+ {
+ 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;
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;
#if PRVMBOUNDSCHECK
if (OPB->_int < 0 || OPB->_int + 4 > prog->edictareasize)
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
- return;
+ PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+ goto cleanup;
}
#endif
- ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
+ ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
ptr->_int = OPA->_int;
break;
case OP_STOREP_V:
#if PRVMBOUNDSCHECK
if (OPB->_int < 0 || OPB->_int + 12 > prog->edictareasize)
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
- return;
+ PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+ goto cleanup;
}
#endif
- ptr = (prvm_eval_t *)((qbyte *)prog->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];
#if PRVMBOUNDSCHECK
if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict\n", PRVM_NAME, OPB->_int);
- return;
+ PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
+ goto cleanup;
}
#endif
- /*if (OPA->edict == 0 && sv.state == ss_active)
+ if (OPA->edict == 0 && !prog->allowworldwrites)
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- Host_Error("assignment to world entity in %s", PRVM_NAME);
- return;
- }*/
+ PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
+ goto cleanup;
+ }
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)prog->edictsfields;
+ OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
break;
case OP_LOAD_F:
#if PRVMBOUNDSCHECK
if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
- return;
+ 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)
{
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ prog->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
- return;
+ 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->vector[0] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[0];
+ OPC->vector[1] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[1];
+ OPC->vector[2] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->vector[2];
break;
//==================
case OP_IFNOT:
if (!OPA->_int)
+ {
+ prog->xfunction->profile += (st - startst);
st += st->b - 1; // offset the s++
+ startst = st;
+ if (++jumpcount == 10000000)
+ {
+ prog->xstatement = st - prog->statements;
+ PRVM_Profile(1<<30, 1000000);
+ 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)
+ {
+ prog->xfunction->profile += (st - startst);
st += st->b - 1; // offset the s++
+ startst = st;
+ if (++jumpcount == 10000000)
+ {
+ prog->xstatement = st - prog->statements;
+ PRVM_Profile(1<<30, 1000000);
+ 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:
+ prog->xfunction->profile += (st - startst);
st += st->a - 1; // offset the s++
+ startst = st;
+ if (++jumpcount == 10000000)
+ {
+ prog->xstatement = st - prog->statements;
+ PRVM_Profile(1<<30, 1000000);
+ 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:
case OP_CALL6:
case OP_CALL7:
case OP_CALL8:
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ 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);
newf = &prog->functions[OPA->function];
+ newf->callcount++;
if (newf->first_statement < 0)
{
}
else
st = prog->statements + PRVM_EnterFunction(newf);
+ startst = st;
break;
case OP_DONE:
case OP_RETURN:
- prog->xfunction->profile += profile - startprofile;
- startprofile = profile;
+ 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[(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];
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_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;
}
else
- PRVM_ERROR("OP_STATE not supported by %s\n", PRVM_NAME);
+ {
+ prog->xfunction->profile += (st - startst);
+ 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:
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ 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 *)((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");
- return;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ 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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ 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:
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
+ goto cleanup;
}
#endif
pr_globals[OPB->_int] = OPA->_float;
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
+ goto cleanup;
}
#endif
pr_globals[OPB->_int ] = OPA->vector[0];
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME);
+ goto cleanup;
}
#endif
OPC->_float = pr_globals[i];
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
+ goto cleanup;
}
#endif
OPC->_float = pr_globals[OPA->_int];
#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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
+ goto cleanup;
}
#endif
OPC->vector[0] = pr_globals[OPA->_int ];
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;
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ 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->xfunction->profile += (st - startst);
prog->xstatement = st - prog->statements;
PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME);
+ goto cleanup;
}
}