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

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 46ab0060..17ea2fcc 100644
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -158,7 +158,7 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
-					return;
+					goto cleanup;
 				}
 #endif
 				ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
@@ -171,13 +171,13 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("%s attempted to write to an out of bounds edict (%i)", PRVM_NAME, OPB->_int);
-					return;
+					goto cleanup;
 				}
 #endif
 				ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
-				ptr->vector[0] = OPA->vector[0];
-				ptr->vector[1] = OPA->vector[1];
-				ptr->vector[2] = OPA->vector[2];
+				ptr->ivector[0] = OPA->ivector[0];
+				ptr->ivector[1] = OPA->ivector[1];
+				ptr->ivector[2] = OPA->ivector[2];
 				break;
 
 			case OP_ADDRESS:
@@ -187,7 +187,7 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("%s attempted to address an invalid field (%i) in an edict", PRVM_NAME, OPB->_int);
-					return;
+					goto cleanup;
 				}
 #endif
 				if (OPA->edict == 0 && !prog->allowworldwrites)
@@ -195,7 +195,7 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("forbidden assignment to null/world entity in %s", PRVM_NAME);
-					return;
+					goto cleanup;
 				}
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
 				OPC->_int = (unsigned char *)((int *)ed->fields.vp + OPB->_int) - (unsigned char *)prog->edictsfields;
@@ -212,7 +212,7 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
-					return;
+					goto cleanup;
 				}
 #endif
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
@@ -226,13 +226,13 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR("%s attempted to read an invalid field in an edict (%i)", PRVM_NAME, OPB->_int);
-					return;
+					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;
 
 		//==================
@@ -243,12 +243,14 @@
 					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;
 
@@ -258,12 +260,14 @@
 					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;
 
@@ -271,12 +275,14 @@
 				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:
@@ -306,7 +312,7 @@
 					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);
@@ -325,7 +331,7 @@
 				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;
@@ -333,10 +339,10 @@
 			case OP_STATE:
 				if(prog->flag & PRVM_OP_STATE)
 				{
-					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
 				{
@@ -506,7 +512,7 @@
 					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);
-					return;
+					goto cleanup;
 				}
 #endif
 				ptr = (prvm_eval_t *)((unsigned char *)prog->edictsfields + OPB->_int);
@@ -519,14 +525,14 @@
 					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);
-					return;
+					goto cleanup;
 				}
 				if (OPB->_int < 0 || OPB->_int >= progs->entityfields)
 				{
 					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);
-					return;
+					goto cleanup;
 				}
 #endif
 				ed = PRVM_PROG_TO_EDICT(OPA->edict);
@@ -545,10 +551,10 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
-					return;
+					goto cleanup;
 				}
 #endif
-				pr_globals[OPB->_int] = OPA->_float;
+				pr_iglobals[OPB->_int] = OPA->_int;
 				break;
 			case OP_GSTOREP_V:
 #if PRBOUNDSCHECK
@@ -557,12 +563,12 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR ("%s Progs attempted to write to an invalid indexed global", PRVM_NAME);
-					return;
+					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:
@@ -573,10 +579,10 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR ("%s Progs attempted to address an out of bounds global", PRVM_NAME);
-					return;
+					goto cleanup;
 				}
 #endif
-				OPC->_float = pr_globals[i];
+				OPC->_int = pr_iglobals[i];
 				break;
 
 			case OP_GLOAD_I:
@@ -591,10 +597,10 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
-					return;
+					goto cleanup;
 				}
 #endif
-				OPC->_float = pr_globals[OPA->_int];
+				OPC->_int = pr_iglobals[OPA->_int];
 				break;
 
 			case OP_GLOAD_V:
@@ -604,12 +610,12 @@
 					prog->xfunction->profile += (st - startst);
 					prog->xstatement = st - prog->statements;
 					PRVM_ERROR ("%s Progs attempted to read an invalid indexed global", PRVM_NAME);
-					return;
+					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:
@@ -618,7 +624,7 @@
 					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);
-					return;
+					goto cleanup;
 				}
 				break;
 
@@ -628,6 +634,7 @@
 				prog->xfunction->profile += (st - startst);
 				prog->xstatement = st - prog->statements;
 				PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME);
+				goto cleanup;
 			}
 		}