+#ifdef PRVMTIMEPROFILING
+#define PreError() \
+ prog->xstatement = st - prog->statements; \
+ tm = Sys_DirtyTime(); \
+ prog->xfunction->profile += (st - startst); \
+ prog->xfunction->tprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0;
+#else
+#define PreError() \
+ prog->xstatement = st - prog->statements; \
+ prog->xfunction->profile += (st - startst);
+#endif
// This code isn't #ifdef/#define protectable, don't try.
+#if PRVMSLOWINTERPRETER
+ {
+ if (prog->watch_global_type != ev_void)
+ {
+ prvm_eval_t *f = PRVM_GLOBALFIELDVALUE(prog->watch_global);
+ prog->xstatement = st + 1 - prog->statements;
+ PRVM_Watchpoint(prog, 1, "Global watchpoint hit by engine", prog->watch_global_type, &prog->watch_global_value, f);
+ }
+ if (prog->watch_field_type != ev_void && prog->watch_edict < prog->max_edicts)
+ {
+ prvm_eval_t *f = PRVM_EDICTFIELDVALUE(prog->edicts + prog->watch_edict, prog->watch_field);
+ prog->xstatement = st + 1 - prog->statements;
+ PRVM_Watchpoint(prog, 1, "Entityfield watchpoint hit by engine", prog->watch_field_type, &prog->watch_edictfield_value, f);
+ }
+ }
+#endif
+
while (1)
{
st++;
-#if PRVMTRACE
- PRVM_PrintStatement(st);
-#endif
-#if PRVMSTATEMENTPROFILING
+#if PRVMSLOWINTERPRETER
+ if (prog->trace)
+ PRVM_PrintStatement(prog, st);
prog->statement_profile[st - prog->statements]++;
+ if (prog->break_statement >= 0)
+ if ((st - prog->statements) == prog->break_statement)
+ {
+ prog->xstatement = st - prog->statements;
+ PRVM_Breakpoint(prog, prog->break_stack_index, "Breakpoint hit");
+ }
#endif
switch (st->op)
OPC->_float = OPA->vector[0]*OPB->vector[0] + OPA->vector[1]*OPB->vector[1] + OPA->vector[2]*OPB->vector[2];
break;
case OP_MUL_FV:
- OPC->vector[0] = OPA->_float * OPB->vector[0];
- OPC->vector[1] = OPA->_float * OPB->vector[1];
- OPC->vector[2] = OPA->_float * OPB->vector[2];
+ tempfloat = OPA->_float;
+ OPC->vector[0] = tempfloat * OPB->vector[0];
+ OPC->vector[1] = tempfloat * OPB->vector[1];
+ OPC->vector[2] = tempfloat * OPB->vector[2];
break;
case OP_MUL_VF:
- OPC->vector[0] = OPB->_float * OPA->vector[0];
- OPC->vector[1] = OPB->_float * OPA->vector[1];
- OPC->vector[2] = OPB->_float * OPA->vector[2];
+ tempfloat = OPB->_float;
+ OPC->vector[0] = tempfloat * OPA->vector[0];
+ OPC->vector[1] = tempfloat * OPA->vector[1];
+ OPC->vector[2] = tempfloat * OPA->vector[2];
break;
case OP_DIV_F:
if( OPB->_float != 0.0f )
}
else
{
- if( developer.integer >= 1 )
+ 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 );
+ VM_Warning(prog, "Attempted division by zero in %s\n", prog->name );
}
OPC->_float = 0.0f;
}
break;
case OP_BITAND:
- OPC->_float = (int)OPA->_float & (int)OPB->_float;
+ OPC->_float = (prvm_int_t)OPA->_float & (prvm_int_t)OPB->_float;
break;
case OP_BITOR:
- OPC->_float = (int)OPA->_float | (int)OPB->_float;
+ OPC->_float = (prvm_int_t)OPA->_float | (prvm_int_t)OPB->_float;
break;
case OP_GE:
OPC->_float = OPA->_float >= OPB->_float;
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 || !*PRVM_GetString(OPA->string);
+ OPC->_float = !OPA->string || !*PRVM_GetString(prog, OPA->string);
break;
case OP_NOT_FNC:
OPC->_float = !OPA->function;
OPC->_float = (OPA->vector[0] == OPB->vector[0]) && (OPA->vector[1] == OPB->vector[1]) && (OPA->vector[2] == OPB->vector[2]);
break;
case OP_EQ_S:
- OPC->_float = !strcmp(PRVM_GetString(OPA->string),PRVM_GetString(OPB->string));
+ OPC->_float = !strcmp(PRVM_GetString(prog, OPA->string),PRVM_GetString(prog, OPB->string));
break;
case OP_EQ_E:
OPC->_float = OPA->_int == OPB->_int;
OPC->_float = (OPA->vector[0] != OPB->vector[0]) || (OPA->vector[1] != OPB->vector[1]) || (OPA->vector[2] != OPB->vector[2]);
break;
case OP_NE_S:
- OPC->_float = strcmp(PRVM_GetString(OPA->string),PRVM_GetString(OPB->string));
+ OPC->_float = strcmp(PRVM_GetString(prog, OPA->string),PRVM_GetString(prog, OPB->string));
break;
case OP_NE_E:
OPC->_float = OPA->_int != OPB->_int;
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 ((unsigned int)OPB->_int >= (unsigned int)prog->entityfieldsarea)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+ PreError();
+ prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)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(prog, "assignment to world.%s (field %i) in %s\n", PRVM_GetString(prog, PRVM_ED_FieldAtOfs(prog, OPB->_int)->s_name), (int)OPB->_int, prog->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;
- PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+ PreError();
+ prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)OPB->_int);
goto cleanup;
}
-#endif
- 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 (OPB->_int < prog->entityfields && !prog->allowworldwrites)
+ {
+ prog->xstatement = st - prog->statements;
+ VM_Warning(prog, "assignment to world.%s (field %i) in %s\n", PRVM_GetString(prog, PRVM_ED_FieldAtOfs(prog, OPB->_int)->s_name), (int)OPB->_int, prog->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 ((unsigned int)OPA->edict >= (unsigned int)prog->max_edicts)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
+ PreError();
+ prog->error_cmd("%s Progs attempted to address an out of bounds edict number", prog->name);
goto cleanup;
}
-#endif
+ if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields))
+ {
+ PreError();
+ prog->error_cmd("%s attempted to address an invalid field (%i) in an edict", prog->name, (int)OPB->_int);
+ goto cleanup;
+ }
+#if 0
if (OPA->edict == 0 && !prog->allowworldwrites)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
+ PreError();
+ prog->error_cmd("forbidden assignment to null/world entity in %s", prog->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.fp - 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 ((unsigned int)OPA->edict >= (unsigned int)prog->max_edicts)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an out of bounds edict number", prog->name);
+ goto cleanup;
+ }
+ if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->entityfields))
+ {
+ PreError();
+ prog->error_cmd("%s attempted to read an invalid field in an edict (%i)", prog->name, (int)OPB->_int);
goto cleanup;
}
-#endif
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- OPC->_int = ((prvm_eval_t *)((int *)ed->fields.vp + OPB->_int))->_int;
+ OPC->_int = ((prvm_eval_t *)(ed->fields.ip + OPB->_int))->_int;
break;
case OP_LOAD_V:
-#if PRVMBOUNDSCHECK
- if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields)
+ if ((unsigned int)OPA->edict >= (unsigned int)prog->max_edicts)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an out of bounds edict number", prog->name);
+ goto cleanup;
+ }
+ if (OPB->_int < 0 || OPB->_int + 2 >= prog->entityfields)
+ {
+ PreError();
+ prog->error_cmd("%s attempted to read an invalid field in an edict (%i)", prog->name, (int)OPB->_int);
goto cleanup;
}
-#endif
ed = PRVM_PROG_TO_EDICT(OPA->edict);
- 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];
+ ptr = (prvm_eval_t *)(ed->fields.ip + OPB->_int);
+ OPC->ivector[0] = ptr->ivector[0];
+ OPC->ivector[1] = ptr->ivector[1];
+ OPC->ivector[2] = ptr->ivector[2];
break;
//==================
case OP_IFNOT:
- if (!OPA->_int)
+ 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 (++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_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
+ PRVM_Profile(prog, 1<<30, 1000000, 0);
+ prog->error_cmd("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", prog->name, jumpcount);
}
}
break;
case OP_IF:
- if (OPA->_int)
+ 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 (++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_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
+ PRVM_Profile(prog, 1<<30, 0.01, 0);
+ prog->error_cmd("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", prog->name, jumpcount);
}
}
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 (++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_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
+ PRVM_Profile(prog, 1<<30, 0.01, 0);
+ prog->error_cmd("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", prog->name, jumpcount);
}
break;
case OP_CALL6:
case OP_CALL7:
case OP_CALL8:
+#ifdef PRVMTIMEPROFILING
+ tm = Sys_DirtyTime();
+ prog->xfunction->tprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0;
+ 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);
+ prog->error_cmd("NULL function in %s", prog->name);
+
+ if(!OPA->function || OPA->function < 0 || OPA->function >= prog->numfunctions)
+ {
+ PreError();
+ prog->error_cmd("%s CALL outside the program", prog->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]();
+ {
+ prog->builtins[builtinnumber](prog);
+#ifdef PRVMTIMEPROFILING
+ tm = Sys_DirtyTime();
+ newf->tprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0;
+ prog->xfunction->tbprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0;
+ starttm = tm;
+#endif
+ }
else
- PRVM_ERROR("No such builtin #%i in %s", builtinnumber, PRVM_NAME);
+ prog->error_cmd("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, prog->name);
+
+ if (prog->trace != cachedpr_trace)
+ goto chooseexecprogram;
}
else
- st = prog->statements + PRVM_EnterFunction(newf);
+ st = prog->statements + PRVM_EnterFunction(prog, newf);
startst = st;
break;
case OP_DONE:
case OP_RETURN:
+#ifdef PRVMTIMEPROFILING
+ tm = Sys_DirtyTime();
+ prog->xfunction->tprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0;
+ 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.ip[OFS_RETURN ] = prog->globals.ip[st->operand[0] ];
+ prog->globals.ip[OFS_RETURN+1] = prog->globals.ip[st->operand[0]+1];
+ prog->globals.ip[OFS_RETURN+2] = prog->globals.ip[st->operand[0]+2];
- st = prog->statements + PRVM_LeaveFunction();
+ st = prog->statements + PRVM_LeaveFunction(prog);
startst = st;
if (prog->depth <= exitdepth)
goto cleanup; // all done
- if (prog->trace != cachedpr_trace)
- goto chooseexecprogram;
break;
case OP_STATE:
if(prog->flag & PRVM_OP_STATE)
{
- ed = PRVM_PROG_TO_EDICT(PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.self)->edict);
- PRVM_GETEDICTFIELDVALUE(ed,prog->fieldoffsets.nextthink)->_float = PRVM_GETGLOBALFIELDVALUE(prog->globaloffsets.time)->_float + 0.1;
- PRVM_GETEDICTFIELDVALUE(ed,prog->fieldoffsets.frame)->_float = OPA->_float;
- PRVM_GETEDICTFIELDVALUE(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);
+ prog->error_cmd("OP_STATE not supported by %s", prog->name);
}
break;
OPC->_int = OPA->_int + OPB->_int;
break;
case OP_ADD_IF:
- OPC->_int = OPA->_int + (int) OPB->_float;
+ OPC->_int = OPA->_int + (prvm_int_t) OPB->_float;
break;
case OP_ADD_FI:
- OPC->_float = OPA->_float + (float) OPB->_int;
+ OPC->_float = OPA->_float + (prvm_vec_t) OPB->_int;
break;
case OP_SUB_I:
OPC->_int = OPA->_int - OPB->_int;
break;
case OP_SUB_IF:
- OPC->_int = OPA->_int - (int) OPB->_float;
+ OPC->_int = OPA->_int - (prvm_int_t) OPB->_float;
break;
case OP_SUB_FI:
- OPC->_float = OPA->_float - (float) OPB->_int;
+ OPC->_float = OPA->_float - (prvm_vec_t) OPB->_int;
break;
case OP_MUL_I:
OPC->_int = OPA->_int * OPB->_int;
break;
case OP_MUL_IF:
- OPC->_int = OPA->_int * (int) OPB->_float;
+ OPC->_int = OPA->_int * (prvm_int_t) OPB->_float;
break;
case OP_MUL_FI:
- OPC->_float = OPA->_float * (float) OPB->_int;
+ OPC->_float = OPA->_float * (prvm_vec_t) OPB->_int;
break;
case OP_MUL_VI:
- OPC->vector[0] = (float) OPB->_int * OPA->vector[0];
- OPC->vector[1] = (float) OPB->_int * OPA->vector[1];
- OPC->vector[2] = (float) OPB->_int * OPA->vector[2];
+ OPC->vector[0] = (prvm_vec_t) OPB->_int * OPA->vector[0];
+ OPC->vector[1] = (prvm_vec_t) OPB->_int * OPA->vector[1];
+ OPC->vector[2] = (prvm_vec_t) OPB->_int * OPA->vector[2];
break;
case OP_DIV_VF:
{
OPC->_int = OPA->_int / OPB->_int;
break;
case OP_DIV_IF:
- OPC->_int = OPA->_int / (int) OPB->_float;
+ OPC->_int = OPA->_int / (prvm_int_t) OPB->_float;
break;
case OP_DIV_FI:
- OPC->_float = OPA->_float / (float) OPB->_int;
+ OPC->_float = OPA->_float / (prvm_vec_t) OPB->_int;
break;
case OP_CONV_IF:
OPC->_float = OPA->_int;
OPC->_int = OPA->_int | OPB->_int;
break;
case OP_BITAND_IF:
- OPC->_int = OPA->_int & (int)OPB->_float;
+ OPC->_int = OPA->_int & (prvm_int_t)OPB->_float;
break;
case OP_BITOR_IF:
- OPC->_int = OPA->_int | (int)OPB->_float;
+ OPC->_int = OPA->_int | (prvm_int_t)OPB->_float;
break;
case OP_BITAND_FI:
- OPC->_float = (int)OPA->_float & OPB->_int;
+ OPC->_float = (prvm_int_t)OPA->_float & OPB->_int;
break;
case OP_BITOR_FI:
- OPC->_float = (int)OPA->_float | OPB->_int;
+ OPC->_float = (prvm_int_t)OPA->_float | OPB->_int;
break;
case OP_GE_I:
OPC->_float = OPA->_int >= OPB->_int;
OPC->_float = OPA->_int || OPB->_int;
break;
case OP_GE_IF:
- OPC->_float = (float)OPA->_int >= OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int >= OPB->_float;
break;
case OP_LE_IF:
- OPC->_float = (float)OPA->_int <= OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int <= OPB->_float;
break;
case OP_GT_IF:
- OPC->_float = (float)OPA->_int > OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int > OPB->_float;
break;
case OP_LT_IF:
- OPC->_float = (float)OPA->_int < OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int < OPB->_float;
break;
case OP_AND_IF:
- OPC->_float = (float)OPA->_int && OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int && OPB->_float;
break;
case OP_OR_IF:
- OPC->_float = (float)OPA->_int || OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int || OPB->_float;
break;
case OP_GE_FI:
- OPC->_float = OPA->_float >= (float)OPB->_int;
+ OPC->_float = OPA->_float >= (prvm_vec_t)OPB->_int;
break;
case OP_LE_FI:
- OPC->_float = OPA->_float <= (float)OPB->_int;
+ OPC->_float = OPA->_float <= (prvm_vec_t)OPB->_int;
break;
case OP_GT_FI:
- OPC->_float = OPA->_float > (float)OPB->_int;
+ OPC->_float = OPA->_float > (prvm_vec_t)OPB->_int;
break;
case OP_LT_FI:
- OPC->_float = OPA->_float < (float)OPB->_int;
+ OPC->_float = OPA->_float < (prvm_vec_t)OPB->_int;
break;
case OP_AND_FI:
- OPC->_float = OPA->_float && (float)OPB->_int;
+ OPC->_float = OPA->_float && (prvm_vec_t)OPB->_int;
break;
case OP_OR_FI:
- OPC->_float = OPA->_float || (float)OPB->_int;
+ OPC->_float = OPA->_float || (prvm_vec_t)OPB->_int;
break;
case OP_NOT_I:
OPC->_float = !OPA->_int;
OPC->_float = OPA->_int == OPB->_int;
break;
case OP_EQ_IF:
- OPC->_float = (float)OPA->_int == OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int == OPB->_float;
break;
case OP_EQ_FI:
- OPC->_float = OPA->_float == (float)OPB->_int;
+ OPC->_float = OPA->_float == (prvm_vec_t)OPB->_int;
break;
case OP_NE_I:
OPC->_float = OPA->_int != OPB->_int;
break;
case OP_NE_IF:
- OPC->_float = (float)OPA->_int != OPB->_float;
+ OPC->_float = (prvm_vec_t)OPA->_int != OPB->_float;
break;
case OP_NE_FI:
- OPC->_float = OPA->_float != (float)OPB->_int;
+ OPC->_float = OPA->_float != (prvm_vec_t)OPB->_int;
break;
case OP_STORE_I:
OPB->_int = OPA->_int;
#if PRBOUNDSCHECK
if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
{
- 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);
+ PreError();
+ prog->error_cmd("%s Progs attempted to write to an out of bounds edict", prog->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;
- PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an out of bounds edict number", prog->name);
goto cleanup;
}
if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
{
- 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);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an invalid field in an edict", prog->name);
goto cleanup;
}
#endif
#if PRBOUNDSCHECK
if (OPB->_int < 0 || OPB->_int >= pr_globaldefs)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to write to an invalid indexed global", prog->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)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to write to an invalid indexed global", prog->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:
- i = OPA->_int + (int) OPB->_float;
+ i = OPA->_int + (prvm_int_t) OPB->_float;
#if PRBOUNDSCHECK
if (i < 0 || i >= pr_globaldefs)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to address an out of bounds global", prog->name);
goto cleanup;
}
#endif
- OPC->_float = pr_globals[i];
+ OPC->_int = pr_iglobals[i];
break;
case OP_GLOAD_I:
#if PRBOUNDSCHECK
if (OPA->_int < 0 || OPA->_int >= pr_globaldefs)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an invalid indexed global", prog->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)
{
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
+ PreError();
+ prog->error_cmd("%s Progs attempted to read an invalid indexed global", prog->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)
{
- 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);
+ PreError();
+ prog->error_cmd("%s Progs boundcheck failed at line number %d, value is < 0 or >= %d", prog->name, st->b, st->c);
goto cleanup;
}
break;
*/
default:
- prog->xfunction->profile += (st - startst);
- prog->xstatement = st - prog->statements;
- PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME);
+ PreError();
+ prog->error_cmd("Bad opcode %i in %s", st->op, prog->name);
goto cleanup;
}
+#if PRVMSLOWINTERPRETER
+ {
+ if (prog->watch_global_type != ev_void)
+ {
+ prvm_eval_t *f = PRVM_GLOBALFIELDVALUE(prog->watch_global);
+ prog->xstatement = st - prog->statements;
+ PRVM_Watchpoint(prog, 0, "Global watchpoint hit", prog->watch_global_type, &prog->watch_global_value, f);
+ }
+ if (prog->watch_field_type != ev_void && prog->watch_edict < prog->max_edicts)
+ {
+ prvm_eval_t *f = PRVM_EDICTFIELDVALUE(prog->edicts + prog->watch_edict, prog->watch_field);
+ prog->xstatement = st - prog->statements;
+ PRVM_Watchpoint(prog, 0, "Entityfield watchpoint hit", prog->watch_field_type, &prog->watch_edictfield_value, f);
+ }
+ }
+#endif
}
+#undef PreError
projects / xonotic / darkplaces.git / blobdiff