X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=02b444b8c728b3e407ca69cf2590d5b9d00a737a;hb=df69ff9acd9810e5ede63838e599bf591f6fae8d;hp=1f8bbc62a57ce82ef8387a352463ffbbc8ad7bd3;hpb=e2715a27d1faedd01c4dfd51e189c21efbcbf9db;p=xonotic%2Fdarkplaces.git diff --git a/prvm_execprogram.h b/prvm_execprogram.h index 1f8bbc62..02b444b8 100644 --- a/prvm_execprogram.h +++ b/prvm_execprogram.h @@ -1,23 +1,48 @@ #ifdef PRVMTIMEPROFILING #define PreError() \ - tm = Sys_DoubleTime(); \ + prog->xstatement = st - cached_statements; \ + tm = Sys_DirtyTime(); \ prog->xfunction->profile += (st - startst); \ - prog->xfunction->tprofile += (tm - starttm); + prog->xfunction->tprofile += (tm - starttm >= 0 && tm - starttm < 1800) ? (tm - starttm) : 0; #else #define PreError() \ + prog->xstatement = st - cached_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 - cached_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 - cached_statements; + PRVM_Watchpoint(prog, 1, "Entityfield watchpoint hit by engine", prog->watch_field_type, &prog->watch_edictfield_value, f); + } + } +#endif + while (1) { st++; #if PRVMSLOWINTERPRETER if (prog->trace) - PRVM_PrintStatement(st); - prog->statement_profile[st - prog->statements]++; + PRVM_PrintStatement(prog, st); + prog->statement_profile[st - cached_statements]++; + if (prog->break_statement >= 0) + if ((st - cached_statements) == prog->break_statement) + { + prog->xstatement = st - cached_statements; + PRVM_Breakpoint(prog, prog->break_stack_index, "Breakpoint hit"); + } #endif switch (st->op) @@ -45,14 +70,16 @@ 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 ) @@ -65,17 +92,17 @@ { prog->xfunction->profile += (st - startst); startst = st; - prog->xstatement = st - prog->statements; - VM_Warning( "Attempted division by zero in %s\n", PRVM_NAME ); + prog->xstatement = st - cached_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; @@ -102,7 +129,7 @@ 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; @@ -117,7 +144,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; @@ -132,7 +159,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; @@ -160,55 +187,66 @@ case OP_STOREP_FLD: // integers case OP_STOREP_S: case OP_STOREP_FNC: // pointers - if (OPB->_int < 0 || OPB->_int + 1 > prog->entityfieldsarea) + if ((prvm_uint_t)OPB->_int - cached_entityfields >= cached_entityfieldsarea_entityfields) { - PreError(); - PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); - goto cleanup; + if ((prvm_uint_t)OPB->_int >= cached_entityfieldsarea) + { + PreError(); + prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)OPB->_int); + goto cleanup; + } + if ((prvm_uint_t)OPB->_int < cached_entityfields && !cached_allowworldwrites) + { + prog->xstatement = st - cached_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); + } } - if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites) - 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 = (prvm_eval_t *)(cached_edictsfields + OPB->_int); ptr->_int = OPA->_int; break; case OP_STOREP_V: - if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfieldsarea) + if ((prvm_uint_t)OPB->_int - cached_entityfields > (prvm_uint_t)cached_entityfieldsarea_entityfields_3) { - PreError(); - PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int); - goto cleanup; + if ((prvm_uint_t)OPB->_int > cached_entityfieldsarea_3) + { + PreError(); + prog->error_cmd("%s attempted to write to an out of bounds edict (%i)", prog->name, (int)OPB->_int); + goto cleanup; + } + if ((prvm_uint_t)OPB->_int < cached_entityfields && !cached_allowworldwrites) + { + prog->xstatement = st - cached_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); + } } - if (OPB->_int < prog->progs->entityfields && !prog->allowworldwrites) - 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 = (prvm_eval_t *)(cached_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 (OPA->edict < 0 || OPA->edict >= prog->max_edicts) + if ((prvm_uint_t)OPA->edict >= cached_max_edicts) { PreError(); - PRVM_ERROR ("%s Progs attempted to address an out of bounds edict number", PRVM_NAME); + prog->error_cmd("%s Progs attempted to address an out of bounds edict number", prog->name); goto cleanup; } - if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields)) + if ((prvm_uint_t)OPB->_int >= cached_entityfields) { PreError(); - PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int); + 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) + if (OPA->edict == 0 && !cached_allowworldwrites) { PreError(); - PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME); + 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 = ed->fields.vp - prog->edictsfields + OPB->_int; + OPC->_int = OPA->edict * cached_entityfields + OPB->_int; break; case OP_LOAD_F: @@ -216,39 +254,40 @@ case OP_LOAD_ENT: case OP_LOAD_S: case OP_LOAD_FNC: - if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) + if ((prvm_uint_t)OPA->edict >= cached_max_edicts) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); + 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->progs->entityfields)) + if ((prvm_uint_t)OPB->_int >= cached_entityfields) { PreError(); - PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int); + prog->error_cmd("%s attempted to read an invalid field in an edict (%i)", prog->name, (int)OPB->_int); goto cleanup; } 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 (OPA->edict < 0 || OPA->edict >= prog->max_edicts) + if ((prvm_uint_t)OPA->edict >= cached_max_edicts) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); + 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->progs->entityfields) + if ((prvm_uint_t)OPB->_int > cached_entityfields_3) { PreError(); - PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int); + prog->error_cmd("%s attempted to read an invalid field in an edict (%i)", prog->name, (int)OPB->_int); goto cleanup; } 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]; + 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; //================== @@ -260,14 +299,14 @@ // and entity, string, field values can never have that value { prog->xfunction->profile += (st - startst); - st += st->b - 1; // offset the s++ + st = cached_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(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); + prog->xstatement = st - cached_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; @@ -279,28 +318,28 @@ // and entity, string, field values can never have that value { prog->xfunction->profile += (st - startst); - st += st->b - 1; // offset the s++ + st = cached_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(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); + prog->xstatement = st - cached_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: prog->xfunction->profile += (st - startst); - st += st->a - 1; // offset the s++ + st = cached_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(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); + prog->xstatement = st - cached_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; @@ -314,21 +353,21 @@ case OP_CALL7: case OP_CALL8: #ifdef PRVMTIMEPROFILING - tm = Sys_DoubleTime(); - prog->xfunction->tprofile += (tm - starttm); + 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->xstatement = st - cached_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 >= (unsigned int)prog->progs->numfunctions) + if(!OPA->function || OPA->function < 0 || OPA->function >= prog->numfunctions) { PreError(); - PRVM_ERROR("%s CALL outside the program", PRVM_NAME); + prog->error_cmd("%s CALL outside the program", prog->name); goto cleanup; } @@ -337,62 +376,76 @@ if (newf->first_statement < 0) { - // negative statements are built in functions + // negative first_statement values are built in functions 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_DoubleTime(); - newf->tprofile += (tm - starttm); - prog->xfunction->tbprofile += (tm - starttm); + 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 + // builtins may cause ED_Alloc() to be called, update cached variables + cached_edictsfields = prog->edictsfields; + cached_entityfields = prog->entityfields; + cached_entityfields_3 = prog->entityfields - 3; + cached_entityfieldsarea = prog->entityfieldsarea; + cached_entityfieldsarea_entityfields = prog->entityfieldsarea - prog->entityfields; + cached_entityfieldsarea_3 = prog->entityfieldsarea - 3; + cached_entityfieldsarea_entityfields_3 = prog->entityfieldsarea - prog->entityfields - 3; + cached_max_edicts = prog->max_edicts; + // these do not change + //cached_statements = prog->statements; + //cached_allowworldwrites = prog->allowworldwrites; + //cached_flag = prog->flag; + // if prog->trace changed we need to change interpreter path + if (prog->trace != cachedpr_trace) + goto chooseexecprogram; } else - PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", 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 = cached_statements + PRVM_EnterFunction(prog, newf); startst = st; break; case OP_DONE: case OP_RETURN: #ifdef PRVMTIMEPROFILING - tm = Sys_DoubleTime(); - prog->xfunction->tprofile += (tm - starttm); + 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->xstatement = st - cached_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 = cached_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) + if(cached_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 { PreError(); - prog->xstatement = st - prog->statements; - PRVM_ERROR("OP_STATE not supported by %s", PRVM_NAME); + prog->xstatement = st - cached_statements; + prog->error_cmd("OP_STATE not supported by %s", prog->name); } break; @@ -402,33 +455,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: { @@ -442,10 +495,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; @@ -460,16 +513,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; @@ -490,40 +543,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; @@ -532,19 +585,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; @@ -554,7 +607,7 @@ if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize) { PreError(); - PRVM_ERROR ("%s Progs attempted to write to an out of bounds edict", PRVM_NAME); + prog->error_cmd("%s Progs attempted to write to an out of bounds edict", prog->name); goto cleanup; } #endif @@ -566,13 +619,13 @@ if (OPA->edict < 0 || OPA->edict >= prog->max_edicts) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an out of bounds edict number", PRVM_NAME); + 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) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an invalid field in an edict", PRVM_NAME); + prog->error_cmd("%s Progs attempted to read an invalid field in an edict", prog->name); goto cleanup; } #endif @@ -590,7 +643,7 @@ if (OPB->_int < 0 || OPB->_int >= pr_globaldefs) { PreError(); - PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); + prog->error_cmd("%s Progs attempted to write to an invalid indexed global", prog->name); goto cleanup; } #endif @@ -601,7 +654,7 @@ if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs) { PreError(); - PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME); + prog->error_cmd("%s Progs attempted to write to an invalid indexed global", prog->name); goto cleanup; } #endif @@ -611,12 +664,12 @@ 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) { PreError(); - PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME); + prog->error_cmd("%s Progs attempted to address an out of bounds global", prog->name); goto cleanup; } #endif @@ -633,7 +686,7 @@ if (OPA->_int < 0 || OPA->_int >= pr_globaldefs) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); + prog->error_cmd("%s Progs attempted to read an invalid indexed global", prog->name); goto cleanup; } #endif @@ -645,7 +698,7 @@ if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs) { PreError(); - PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME); + prog->error_cmd("%s Progs attempted to read an invalid indexed global", prog->name); goto cleanup; } #endif @@ -658,7 +711,7 @@ if (OPA->_int < 0 || OPA->_int >= st->b) { PreError(); - PRVM_ERROR ("%s Progs boundcheck failed at line number %d, value is < 0 or >= %d", PRVM_NAME, st->b, st->c); + 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; @@ -667,9 +720,25 @@ default: PreError(); - PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME); + 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 - cached_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 - cached_statements; + PRVM_Watchpoint(prog, 0, "Entityfield watchpoint hit", prog->watch_field_type, &prog->watch_edictfield_value, f); + } + } +#endif } #undef PreError