while (1)
{
- st++; // TODO bounds check
+ st++;
#if PRVMTRACE
PRVM_PrintStatement(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_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;
goto cleanup;
}
#endif
- ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+ 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);
+ 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;
goto cleanup;
}
#endif
- ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
+ 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);
+ 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];
case OP_ADDRESS:
#if PRVMBOUNDSCHECK
+ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts)
+ {
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements;
+ 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))
{
prog->xfunction->profile += (st - startst);
goto cleanup;
}
#endif
+#if 0
if (OPA->edict == 0 && !prog->allowworldwrites)
{
prog->xfunction->profile += (st - startst);
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_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;
+ 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))
{
prog->xfunction->profile += (st - startst);
goto cleanup;
}
#endif
- ed = PRVM_PROG_TO_EDICT(OPA->edict); // TODO bounds check entity number
+ 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;
+ 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)
{
prog->xfunction->profile += (st - startst);
goto cleanup;
}
#endif
- ed = PRVM_PROG_TO_EDICT(OPA->edict); // TODO bounds check entity number
+ 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];
OPC->ivector[2] = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->ivector[2];
//==================
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++
startst = st;
+ // no bounds check needed, it is done when loading progs
#if PRVMRUNAWAYCHECK
if (++jumpcount == 10000000)
{
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++
startst = st;
+ // no bounds check needed, it is done when loading progs
#if PRVMRUNAWAYCHECK
if (++jumpcount == 10000000)
{
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
prog->xfunction->profile += (st - startst);
st += st->a - 1; // offset the s++
startst = st;
+ // no bounds check needed, it is done when loading progs
#if PRVMRUNAWAYCHECK
if (++jumpcount == 10000000)
{
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
prog->argc = st->op - OP_CALL0;
if (!OPA->function)
PRVM_ERROR("NULL function in %s", PRVM_NAME);
- newf = &prog->functions[OPA->function]; // TODO bounds check function
+
+#if PRVMBOUNDSCHECK
+ if(!OPA->function || OPA->function >= (unsigned int)prog->progs->numfunctions)
+ {
+ prog->xfunction->profile += (st - startst);
+ prog->xstatement = st - prog->statements; // we better stay on the previously executed statement
+ PRVM_ERROR("%s CALL outside the program", PRVM_NAME);
+ goto cleanup;
+ }
+#endif
+
+ newf = &prog->functions[OPA->function];
newf->callcount++;
if (newf->first_statement < 0)
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;
projects / xonotic / darkplaces.git / blobdiff