X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=pr_execprogram.h;h=f70f100ebeefad3cacc61e0b5fc7771765d19658;hp=fd306cf2154a0fc1bcbb1a0c2f1963374369be22;hb=6f079ecb90e1e6b7597d4da1a98f95c5822aad8d;hpb=0256e57e16a302ad45090618b8d6eb5930788809

diff --git a/pr_execprogram.h b/pr_execprogram.h
index fd306cf2..f70f100e 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;
-				PR_RunError ("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,13 +90,13 @@
 				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 || !*PRVM_GetString(OPA->string);
 				break;
 			case OP_NOT_FNC:
 				OPC->_float = !OPA->function;
 				break;
 			case OP_NOT_ENT:
-				OPC->_float = (PROG_TO_EDICT(OPA->edict) == sv.edicts);
+				OPC->_float = (OPA->edict == 0);
 				break;
 			case OP_EQ_F:
 				OPC->_float = OPA->_float == OPB->_float;
@@ -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(PRVM_GetString(OPA->string),PRVM_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(PRVM_GetString(OPA->string),PRVM_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,30 +151,28 @@
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
-					return;
-				}
-				if (OPB->_int % pr_edict_size < ((qbyte *)&sv.edicts->v - (qbyte *)sv.edicts))
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an engine edict field\n");
+					Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				ptr = (prvm_eval_t *)((qbyte *)prog->edictsfields + OPB->_int);
 				ptr->_int = OPA->_int;
 				break;
 			case OP_STOREP_V:
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 12 > pr_edictareasize)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
+					Host_Error("Progs attempted to write to an out of bounds edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				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];
@@ -174,43 +180,25 @@
 
 			case OP_ADDRESS:
 #if PRBOUNDSCHECK
-				if (OPA->edict <= 0)
-				{
-					if (OPA->edict == 0 && sv.state == ss_active)
-					{
-						pr_xstatement = st - pr_statements;
-						PR_RunError ("assignment to world entity");
-						return;
-					}
-					else
-					{
-						pr_xstatement = st - pr_statements;
-						PR_RunError("Progs attempted to address an out of bounds edict\n");
-						return;
-					}
-				}
-				else if (OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to address an out of bounds edict\n");
-					return;
-				}
-				if (OPB->_int < 0 || 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;
-					PR_RunError("Progs attempted to address an invalid field in an edict\n");
+					Host_Error("Progs attempted to address an invalid field (%i) in an edict\n", OPB->_int);
 					return;
 				}
-#else
+#endif
 				if (OPA->edict == 0 && sv.state == ss_active)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError ("assignment to world entity");
+					Host_Error("assignment to world entity");
 					return;
 				}
-#endif
-				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = (qbyte *)((int *)&ed->v + OPB->_int) - (qbyte *)sv.edicts;
+				ed = PRVM_PROG_TO_EDICT(OPA->edict);
+				OPC->_int = (qbyte *)((int *)ed->v + OPB->_int) - (qbyte *)prog->edictsfields;
 				break;
 
 			case OP_LOAD_F:
@@ -219,42 +207,34 @@
 			case OP_LOAD_S:
 			case OP_LOAD_FNC:
 #if PRBOUNDSCHECK
-				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
-					return;
-				}
-				if (OPB->_int < 0 || 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;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = ((eval_t *)((int *)&ed->v + OPB->_int))->_int;
+				ed = PRVM_PROG_TO_EDICT(OPA->edict);
+				OPC->_int = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->_int;
 				break;
 
 			case OP_LOAD_V:
 #if PRBOUNDSCHECK
-				if (OPA->edict < 0 || OPA->edict >= pr_edictareasize)
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
-					return;
-				}
 				if (OPB->_int < 0 || OPB->_int + 2 >= progs->entityfields)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict (%i)\n", OPB->_int);
 					return;
 				}
 #endif
-				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->vector[0] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[0];
-				OPC->vector[1] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[1];
-				OPC->vector[2] = ((eval_t *)((int *)&ed->v + OPB->_int))->vector[2];
+				ed = PRVM_PROG_TO_EDICT(OPA->edict);
+				OPC->vector[0] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[0];
+				OPC->vector[1] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[1];
+				OPC->vector[2] = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->vector[2];
 				break;
 
 		//==================
@@ -286,24 +266,36 @@
 				startprofile = profile;
 				pr_xstatement = st - pr_statements;
 				pr_argc = st->op - OP_CALL0;
-				if (!OPA->function)
-					PR_RunError ("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 = &prog->functions[OPA->function];
+				newf->callcount++;
 
 				if (newf->first_statement < 0)
 				{
 					// negative statements are built in functions
-					if ((-newf->first_statement) >= pr_numbuiltins)
-						PR_RunError ("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);
+				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];
@@ -316,10 +308,13 @@
 				break;
 
 			case OP_STATE:
-				ed = PROG_TO_EDICT(pr_global_struct->self);
-				ed->v.nextthink = pr_global_struct->time + 0.1;
-				ed->v.frame = OPA->_float;
-				ed->v.think = OPB->function;
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
+				pr_xstatement = st - pr_statements;
+				ed = PRVM_PROG_TO_EDICT(prog->globals.server->self);
+				ed->fields.server->nextthink = prog->globals.server->time + 0.1;
+				ed->fields.server->frame = OPA->_float;
+				ed->fields.server->think = OPB->function;
 				break;
 
 // LordHavoc: to be enabled when Progs version 7 (or whatever it will be numbered) is finalized
@@ -479,37 +474,37 @@
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 4 > pr_edictareasize)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an out of bounds edict\n");
-					return;
-				}
-				if (OPB->_int % pr_edict_size < ((qbyte *)&sv.edicts->v - (qbyte *)sv.edicts))
-				{
-					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an engine edict field\n");
+					Host_Error("Progs attempted to write to an out of bounds edict\n");
 					return;
 				}
 #endif
-				ptr = (eval_t *)((qbyte *)sv.edicts + OPB->_int);
+				ptr = (prvm_eval_t *)((qbyte *)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;
-					PR_RunError("Progs attempted to read an out of bounds edict number\n");
+					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;
-					PR_RunError("Progs attempted to read an invalid field in an edict\n");
+					Host_Error("Progs attempted to read an invalid field in an edict\n");
 					return;
 				}
 #endif
-				ed = PROG_TO_EDICT(OPA->edict);
-				OPC->_int = ((eval_t *)((int *)&ed->v + OPB->_int))->_int;
+				ed = PRVM_PROG_TO_EDICT(OPA->edict);
+				OPC->_int = ((prvm_eval_t *)((int *)ed->v + OPB->_int))->_int;
 				break;
 
 			case OP_GSTOREP_I:
@@ -521,8 +516,10 @@
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int >= pr_globaldefs)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an invalid indexed global\n");
+					Host_Error("Progs attempted to write to an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -532,8 +529,10 @@
 #if PRBOUNDSCHECK
 				if (OPB->_int < 0 || OPB->_int + 2 >= pr_globaldefs)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to write to an invalid indexed global\n");
+					Host_Error("Progs attempted to write to an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -547,8 +546,10 @@
 #if PRBOUNDSCHECK
 				if (i < 0 || i >= pr_globaldefs)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to address an out of bounds global\n");
+					Host_Error("Progs attempted to address an out of bounds global\n");
 					return;
 				}
 #endif
@@ -564,8 +565,10 @@
 #if PRBOUNDSCHECK
 				if (OPA->_int < 0 || OPA->_int >= pr_globaldefs)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid indexed global\n");
+					Host_Error("Progs attempted to read an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -576,8 +579,10 @@
 #if PRBOUNDSCHECK
 				if (OPA->_int < 0 || OPA->_int + 2 >= pr_globaldefs)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs attempted to read an invalid indexed global\n");
+					Host_Error("Progs attempted to read an invalid indexed global\n");
 					return;
 				}
 #endif
@@ -589,8 +594,10 @@
 			case OP_BOUNDCHECK:
 				if (OPA->_int < 0 || OPA->_int >= st->b)
 				{
+					pr_xfunction->profile += profile - startprofile;
+					startprofile = profile;
 					pr_xstatement = st - pr_statements;
-					PR_RunError("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c);
+					Host_Error("Progs boundcheck failed at line number %d, value is < 0 or >= %d\n", st->b, st->c);
 					return;
 				}
 				break;
@@ -598,8 +605,10 @@
 */
 
 			default:
+				pr_xfunction->profile += profile - startprofile;
+				startprofile = profile;
 				pr_xstatement = st - pr_statements;
-				PR_RunError ("Bad opcode %i", st->op);
+				Host_Error ("Bad opcode %i", st->op);
 			}
 		}