X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_execprogram.h;h=9cc8ed4c35ed6d34b3ec63a2f56715b437028276;hp=f41a4c5919debca869768404812df366c2133701;hb=832ba0937327c893bfd49f1a738812dae1a995a5;hpb=fb5638603d5fb14033bb41a99dbaba135b5e7985

diff --git a/pr_execprogram.h b/pr_execprogram.h
index f41a4c59..9cc8ed4c 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)
@@ -82,7 +90,7 @@
 				OPC->_float = !OPA->vector[0] && !OPA->vector[1] && !OPA->vector[2];
 				break;
 			case OP_NOT_S:
-				OPC->_float = !OPA->string || !pr_strings[OPA->string];
+				OPC->_float = !OPA->string || !*PR_GetString(OPA->string);
 				break;
 			case OP_NOT_FNC:
 				OPC->_float = !OPA->function;
@@ -97,7 +105,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(pr_strings+OPA->string,pr_strings+OPB->string);
+				OPC->_float = !strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string));
 				break;
 			case OP_EQ_E:
 				OPC->_float = OPA->_int == OPB->_int;
@@ -112,7 +120,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(pr_strings+OPA->string,pr_strings+OPB->string);
+				OPC->_float = strcmp(PR_GetString(OPA->string),PR_GetString(OPB->string));
 				break;
 			case OP_NE_E:
 				OPC->_float = OPA->_int != OPB->_int;
@@ -130,9 +138,9 @@
 				OPB->_int = OPA->_int;
 				break;
 			case OP_STORE_V:
-				OPB->vector[0] = OPA->vector[0];
-				OPB->vector[1] = OPA->vector[1];
-				OPB->vector[2] = OPA->vector[2];
+				OPB->ivector[0] = OPA->ivector[0];
+				OPB->ivector[1] = OPA->ivector[1];
+				OPB->ivector[2] = OPA->ivector[2];
 				break;
 
 			case OP_STOREP_F:
@@ -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 >= progs->entityfields)
+				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 >= progs->entityfields)
+				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;
 				}
@@ -246,16 +267,19 @@
 				pr_xstatement = st - pr_statements;
 				pr_argc = st->op - OP_CALL0;
 				if (!OPA->function)
-					Host_Error ("NULL function");
+					Host_Error("NULL function");
 
 				newf = &pr_functions[OPA->function];
 
 				if (newf->first_statement < 0)
 				{
 					// negative statements are built in functions
-					if ((-newf->first_statement) >= pr_numbuiltins)
-						Host_Error ("Bad builtin call number");
-					pr_builtins[-newf->first_statement] ();
+					int builtinnumber = -newf->first_statement;
+					pr_xfunction->builtinsprofile++;
+					if (builtinnumber < pr_numbuiltins && pr_builtins[builtinnumber])
+						pr_builtins[builtinnumber]();
+					else
+						Host_Error("No such builtin #%i", builtinnumber);
 				}
 				else
 					st = pr_statements + PR_EnterFunction(newf);
@@ -263,6 +287,10 @@
 
 			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];
@@ -275,6 +303,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;
@@ -438,6 +469,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;
@@ -450,12 +483,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;
@@ -474,6 +511,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;
@@ -485,6 +524,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;
@@ -500,6 +541,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;
@@ -517,6 +560,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;
@@ -529,6 +574,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;
@@ -542,6 +589,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;
@@ -551,6 +600,8 @@
 */
 
 			default:
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
 				pr_xstatement = st - pr_statements;
 				Host_Error ("Bad opcode %i", st->op);
 			}