X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_execprogram.h;h=17ea2fccca4b341d4789c05840f0275938c9b0ce;hp=fd50149a887dc0f9032449f48c097b8acec29056;hb=a854130c17f1490cf5fb25650994c12d8c9ad0a7;hpb=cee06f041a5d05361bc9d03fa1fe1328d572fbea

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index fd50149a..17ea2fcc 100644
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -4,23 +4,13 @@
 		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);
 #endif
+#if PRVMSTATEMENTPROFILING
+			prog->statement_profile[st - prog->statements]++;
+#endif
 
 			switch (st->op)
 			{
@@ -57,7 +47,21 @@
 				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 >= 1 )
+					{
+						prog->xfunction->profile += (st - startst);
+						startst = st;
+						prog->xstatement = st - prog->statements;
+						VM_Warning( "Attempted division by zero in %s\n", PRVM_NAME );
+					}
+					OPC->_float = 0.0f;
+				}
 				break;
 			case OP_BITAND:
 				OPC->_float = (int)OPA->_float & (int)OPB->_float;
@@ -151,54 +155,50 @@
 #if PRVMBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 4 > prog->edictareasize)
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
-					return;
+					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+					goto cleanup;
 				}
 #endif
-				ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
+				ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_STOREP_V:
 #if PRVMBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 12 > prog->edictareasize)
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)\n", PRVM_NAME, OPB->_int);
-					return;
+					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
+					goto cleanup;
 				}
 #endif
-				ptr = (prvm_eval_t *)((qbyte *)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 *)((unsigned char *)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))
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict\n", PRVM_NAME, OPB->_int);
-					return;
+					PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
+					goto cleanup;
 				}
 #endif
 				if (OPA->edict == 0 && !prog->allowworldwrites)
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					Host_Error("assignment to world entity in %s", PRVM_NAME);
-					return;
+					PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
+					goto cleanup;
 				}
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
-				OPC->_int = (qbyte *)((int *)ed->fields.vp + OPB->_int) - (qbyte *)prog->edictsfields;
+				OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
 				break;
 
 			case OP_LOAD_F:
@@ -209,11 +209,10 @@
 #if PRVMBOUNDSCHECK
 				if ((unsigned int)(OPB->_int) >= (unsigned int)(prog->progs->entityfields))
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
-					return;
+					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);
@@ -224,33 +223,66 @@
 #if PRVMBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 2 >= prog->progs->entityfields)
 				{
-					prog->xfunction->profile += profile - startprofile;
-					startprofile = profile;
+					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
-					PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)\n", PRVM_NAME, OPB->_int);
-					return;
+					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->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 *)((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];
 				break;
 
 		//==================
 
 			case OP_IFNOT:
 				if (!OPA->_int)
+				{
+					prog->xfunction->profile += (st - startst);
 					st += st->b - 1;	// offset the s++
+					startst = st;
+#if PRVMRUNAWAYCHECK
+					if (++jumpcount == 10000000)
+					{
+						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);
+					}
+#endif
+				}
 				break;
 
 			case OP_IF:
 				if (OPA->_int)
+				{
+					prog->xfunction->profile += (st - startst);
 					st += st->b - 1;	// offset the s++
+					startst = st;
+#if PRVMRUNAWAYCHECK
+					if (++jumpcount == 10000000)
+					{
+						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);
+					}
+#endif
+				}
 				break;
 
 			case OP_GOTO:
+				prog->xfunction->profile += (st - startst);
 				st += st->a - 1;	// offset the s++
+				startst = st;
+#if PRVMRUNAWAYCHECK
+				if (++jumpcount == 10000000)
+				{
+					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);
+				}
+#endif
 				break;
 
 			case OP_CALL0:
@@ -262,8 +294,8 @@
 			case OP_CALL6:
 			case OP_CALL7:
 			case OP_CALL8:
-				prog->xfunction->profile += profile - startprofile;
-				startprofile = profile;
+				prog->xfunction->profile += (st - startst);
+				startst = st;
 				prog->xstatement = st - prog->statements;
 				prog->argc = st->op - OP_CALL0;
 				if (!OPA->function)
@@ -280,16 +312,16 @@
 					if (builtinnumber < prog->numbuiltins && prog->builtins[builtinnumber])
 						prog->builtins[builtinnumber]();
 					else
-						PRVM_ERROR("No such builtin #%i in %s", builtinnumber, PRVM_NAME);
+						PRVM_ERROR("No such builtin #%i in %s; most likely cause: outdated engine build. Try updating!", builtinnumber, PRVM_NAME);
 				}
 				else
 					st = prog->statements + PRVM_EnterFunction(newf);
+				startst = st;
 				break;
 
 			case OP_DONE:
 			case OP_RETURN:
-				prog->xfunction->profile += profile - startprofile;
-				startprofile = profile;
+				prog->xfunction->profile += (st - startst);
 				prog->xstatement = st - prog->statements;
 
 				prog->globals.generic[OFS_RETURN] = prog->globals.generic[(unsigned short) st->a];
@@ -297,8 +329,9 @@
 				prog->globals.generic[OFS_RETURN+2] = prog->globals.generic[(unsigned short) st->a+2];
 
 				st = prog->statements + PRVM_LeaveFunction();
+				startst = st;
 				if (prog->depth <= exitdepth)
-					return;		// all done
+					goto cleanup; // all done
 				if (prog->trace != cachedpr_trace)
 					goto chooseexecprogram;
 				break;
@@ -306,16 +339,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_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;
 				}
 				else
-					PRVM_ERROR("OP_STATE not supported by %s\n", PRVM_NAME);
+				{
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR("OP_STATE not supported by %s", PRVM_NAME);
+				}
 				break;
 
 // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
@@ -475,33 +509,30 @@
 #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;
+					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);
+					goto cleanup;
 				}
 #endif
-				ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
+				ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_LOAD_I:
 #if PRBOUNDSCHECK
 				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
 				{
-					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;
+					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 >= 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;
+					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);
+					goto cleanup;
 				}
 #endif
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
@@ -517,29 +548,27 @@
 #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;
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_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;
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_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:
@@ -547,14 +576,13 @@
 #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;
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME);
+					goto cleanup;
 				}
 #endif
-				OPC->_float = pr_globals[i];
+				OPC->_int = pr_iglobals[i];
 				break;
 
 			case OP_GLOAD_I:
@@ -566,50 +594,47 @@
 #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;
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_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;
+					prog->xfunction->profile += (st - startst);
+					prog->xstatement = st - prog->statements;
+					PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_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;
+					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);
+					goto cleanup;
 				}
 				break;
 
 */
 
 			default:
-				prog->xfunction->profile += profile - startprofile;
-				startprofile = profile;
+				prog->xfunction->profile += (st - startst);
 				prog->xstatement = st - prog->statements;
 				PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME);
+				goto cleanup;
 			}
 		}