X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=pr_execprogram.h;h=3ea2241ebb880f7016fdf149158d8ace205570b9;hb=8ba95d27a44c667568ae9a5aa1b4b69d75a9d565;hp=10b4f7c20f2e742b8d679efc4806c2239d6d184d;hpb=aeaa2e3aee423ce711638177da0b11ae3836962d;p=xonotic%2Fdarkplaces.git

diff --git a/pr_execprogram.h b/pr_execprogram.h
index 10b4f7c2..3ea2241e 100644
--- a/pr_execprogram.h
+++ b/pr_execprogram.h
@@ -4,14 +4,22 @@
 		while (1)
 		{
 			st++;
-			if (++profile > 1000000) // LordHavoc: increased runaway loop limit 10x
+			if (++profile > 10000000) // LordHavoc: increased runaway loop limit 100x
 			{
+				// LordHavoc: update profile counter for debugging reasons
+				// (identifying erroneous loops and recursion patterns)
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
+				// update the statement number before we error out
 				pr_xstatement = st - pr_statements;
-				Host_Error ("runaway loop error");
+				Host_Error("runaway loop counter hit limit of %d opcodes\ntip: if having trouble identifying the problem, try typing profile now", profile);
 			}
 
 #if PRTRACE
-			PR_PrintStatement (st);
+			pr_xfunction->profile += profile - startprofile;
+			startprofile = profile;
+			pr_xstatement = st - pr_statements;
+			PR_PrintStatement(st);
 #endif
 
 			switch (st->op)
@@ -143,6 +151,8 @@
 #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 (%i)\n", OPB->_int);
 					return;
@@ -155,6 +165,8 @@
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 12 > 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 (%i)\n", OPB->_int);
 					return;
@@ -167,17 +179,22 @@
 				break;
 
 			case OP_ADDRESS:
-				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
 				if ((unsigned int)(OPB->_int) >= (unsigned int)(progs->entityfields))
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
+					pr_xstatement = st - pr_statements;
 					Host_Error("Progs attempted to address an invalid field (%i) in an edict\n", OPB->_int);
 					return;
 				}
 #endif
 				if (OPA->edict == 0 && sv.state == ss_active)
 				{
-					Host_Error ("assignment to world entity");
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
+					pr_xstatement = st - pr_statements;
+					Host_Error("assignment to world entity");
 					return;
 				}
 				ed = PROG_TO_EDICT(OPA->edict);
@@ -189,10 +206,12 @@
 			case OP_LOAD_ENT:
 			case OP_LOAD_S:
 			case OP_LOAD_FNC:
-				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
 				if ((unsigned int)(OPB->_int) >= (unsigned 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 (%i)\n", OPB->_int);
 					return;
 				}
@@ -202,10 +221,12 @@
 				break;
 
 			case OP_LOAD_V:
-				pr_xstatement = st - pr_statements;
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 2 >= 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 (%i)\n", OPB->_int);
 					return;
 				}
@@ -245,10 +266,13 @@
 				startprofile = profile;
 				pr_xstatement = st - pr_statements;
 				pr_argc = st->op - OP_CALL0;
-				if (!OPA->function)
-					Host_Error ("NULL function");
+				if (!OPA->function )
+					Host_Error("NULL function");
+				else if (OPA->function > (unsigned) progs->numfunctions)
+					Host_Error("Bad function number");
 
 				newf = &pr_functions[OPA->function];
+				newf->callcount++;
 
 				if (newf->first_statement < 0)
 				{
@@ -256,16 +280,22 @@
 					int builtinnumber = -newf->first_statement;
 					pr_xfunction->builtinsprofile++;
 					if (builtinnumber < pr_numbuiltins && pr_builtins[builtinnumber])
-						pr_builtins[builtinnumber] ();
+						pr_builtins[builtinnumber]();
 					else
-						Host_Error ("No such builtin #%i", builtinnumber);
+						Host_Error("No such builtin #%i", builtinnumber);
 				}
 				else
 					st = pr_statements + PR_EnterFunction(newf);
+				if (pr_trace != cachedpr_trace)
+					goto chooseexecprogram;
 				break;
 
 			case OP_DONE:
 			case OP_RETURN:
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
+				pr_xstatement = st - pr_statements;
+
 				pr_globals[OFS_RETURN] = pr_globals[(unsigned short) st->a];
 				pr_globals[OFS_RETURN+1] = pr_globals[(unsigned short) st->a+1];
 				pr_globals[OFS_RETURN+2] = pr_globals[(unsigned short) st->a+2];
@@ -278,6 +308,9 @@
 				break;
 
 			case OP_STATE:
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
+				pr_xstatement = st - pr_statements;
 				ed = PROG_TO_EDICT(pr_global_struct->self);
 				ed->v->nextthink = pr_global_struct->time + 0.1;
 				ed->v->frame = OPA->_float;
@@ -441,6 +474,8 @@
 #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;
@@ -453,12 +488,16 @@
 #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;
 				}
 				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;
@@ -477,6 +516,8 @@
 #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;
@@ -488,6 +529,8 @@
 #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;
@@ -503,6 +546,8 @@
 #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;
@@ -520,6 +565,8 @@
 #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;
@@ -532,6 +579,8 @@
 #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;
@@ -545,6 +594,8 @@
 			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;
@@ -554,6 +605,8 @@
 */
 
 			default:
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
 				pr_xstatement = st - pr_statements;
 				Host_Error ("Bad opcode %i", st->op);
 			}