X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=c787e6fec3583613439091b48c401baa3db67408;hb=7c12ccb67e964e24bccb841a6c9a13daf8b5f771;hp=5018b79df49a1de0437e4fc7a7f977d64ddd13b7;hpb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;p=xonotic%2Fdarkplaces.git diff --git a/prvm_execprogram.h b/prvm_execprogram.h index 5018b79d..c787e6fe 100644 --- a/prvm_execprogram.h +++ b/prvm_execprogram.h @@ -1,25 +1,25 @@ +#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. 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(prog, st); + prog->statement_profile[st - prog->statements]++; #endif switch (st->op) @@ -57,13 +57,27 @@ 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(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; @@ -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 || !*PRVM_GetString(OPA->string); + OPC->_float = !OPA->string || !*PRVM_GetString(prog, OPA->string); break; case OP_NOT_FNC: OPC->_float = !OPA->function; @@ -105,7 +119,7 @@ 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; @@ -120,7 +134,7 @@ 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; @@ -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(); + prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)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(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); } -#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_STOREP_V: -#if PRVMBOUNDSCHECK - if (OPB->_int < 0 || OPB->_int + 12 > prog->edictareasize) + if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfieldsarea) + { + PreError(); + prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)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(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); } -#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]; + 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(); + 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 += profile - startprofile; - startprofile = profile; - prog->xstatement = st - prog->statements; - PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME); - return; + 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: @@ -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(); + 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 (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(); + 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]; + OPC->ivector[0] = ((prvm_eval_t *)(ed->fields.ip + OPB->_int))->ivector[0]; + OPC->ivector[1] = ((prvm_eval_t *)(ed->fields.ip + OPB->_int))->ivector[1]; + OPC->ivector[2] = ((prvm_eval_t *)(ed->fields.ip + 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(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) - 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(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: - 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(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_CALL0: @@ -262,12 +321,24 @@ case OP_CALL6: case OP_CALL7: case OP_CALL8: - prog->xfunction->profile += profile - startprofile; - startprofile = profile; +#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++; @@ -278,27 +349,41 @@ 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); } else - st = prog->statements + PRVM_EnterFunction(newf); + st = prog->statements + PRVM_EnterFunction(prog, newf); + startst = st; break; case OP_DONE: case OP_RETURN: - prog->xfunction->profile += profile - startprofile; - startprofile = profile; +#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) - return; // all done + goto cleanup; // all done if (prog->trace != cachedpr_trace) goto chooseexecprogram; break; @@ -306,16 +391,17 @@ case 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_FindField ("nextthink")->ofs) = *prog->time + 0.1; - PRVM_E_FLOAT(ed,PRVM_ED_FindField ("frame")->ofs) = OPA->_float; - *(func_t *)((float*)ed->fields.vp + PRVM_ED_FindField ("think")->ofs) = 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; + prog->error_cmd("OP_STATE not supported by %s", prog->name); + } break; // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized @@ -324,33 +410,33 @@ 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: { @@ -364,10 +450,10 @@ 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; @@ -382,16 +468,16 @@ 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; @@ -412,40 +498,40 @@ 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; @@ -454,19 +540,19 @@ 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; @@ -475,33 +561,27 @@ #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(); + 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) { - 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(); + 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) { - 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(); + prog->error_cmd("%s Progs attempted to read an invalid field in an edict", prog->name); + goto cleanup; } #endif ed = PRVM_PROG_TO_EDICT(OPA->edict); @@ -517,44 +597,38 @@ #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(); + 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) { - 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(); + 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) { - 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(); + 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: @@ -566,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(); + 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) { - 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(); + 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) { - 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(); + 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 += profile - startprofile; - startprofile = profile; - 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; } } +#undef PreError