+#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.
{
st++;
-#if PRVMTRACE
- PRVM_PrintStatement(st);
-#endif
-#if PRVMSTATEMENTPROFILING
+#if PRVMSLOWINTERPRETER
+ if (prog->trace)
+ PRVM_PrintStatement(st);
prog->statement_profile[st - prog->statements]++;
#endif
}
else
{
- if( developer.integer >= 1 )
+ if (developer.integer)
{
prog->xfunction->profile += (st - startst);
startst = st;
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];
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)
{
- 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
- ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+ 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 + 12 > prog->edictareasize)
+ 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
- ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+ 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];
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 += (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->entityfields))
+ {
+ 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;
}
+#endif
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
+ OPC->_int = ed->fields.vp - prog->edictsfields + OPB->_int;
break;
case OP_LOAD_F:
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 += (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->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 = ((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 += (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->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->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];
//==================
case OP_IFNOT:
- if (!OPA->_float)
- // TODO add an "int-ifnot"
+ 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 += st->b - 1; // offset the s++
+ st = prog->statements + st->jumpabsolute - 1; // offset the st++
startst = st;
-#if PRVMRUNAWAYCHECK
- if (++jumpcount == 10000000)
+ // 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);
+ 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;
case OP_IF:
- if (OPA->_float)
- // TODO add an "int-if"
+ 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 += st->b - 1; // offset the s++
+ st = prog->statements + st->jumpabsolute - 1; // offset the st++
startst = st;
-#if PRVMRUNAWAYCHECK
- if (++jumpcount == 10000000)
+ // 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);
+ 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;
-#if PRVMRUNAWAYCHECK
- if (++jumpcount == 10000000)
+ // 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);
+ 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:
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;
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++;
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);
}
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;
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_gameglobaledict(self));
+ PRVM_gameedictfloat(ed,nextthink) = PRVM_gameglobalfloat(time) + 0.1;
+ PRVM_gameedictfloat(ed,frame) = OPA->_float;
+ PRVM_gameedictfunction(ed,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);
}
#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;
}
#endif
- ptr = (prvm_eval_t *)((unsigned char *)prog->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)
{
- 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;
}
#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;
}
#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;
}
#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;
}
#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;
}
#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;
}
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;
}
*/
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
projects / xonotic / darkplaces.git / blobdiff