X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_execprogram.h;h=6b7018c12e284774a35f0866914ac5c3c1654083;hb=00d8da42f76d5e04a9d11e0deaac38391132808a;hp=78d859e0a25a4b0b0b35b6a5d9d1ed0e0f937558;hpb=da58bedc8a3512a9a4d4272c9ce89b7dd6fe4324;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 78d859e0..6b7018c1 100644
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -50,10 +50,14 @@
 				if( OPB->_float != 0.0f )
 				{
 					OPC->_float = OPA->_float / OPB->_float;
-				} 
-				else 
+				}
+				else
 				{
-					if( developer.integer >= 1 ) {
+					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;
@@ -154,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);
@@ -167,7 +171,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);
@@ -183,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)
@@ -191,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;
@@ -208,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);
@@ -222,7 +226,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);
@@ -243,7 +247,7 @@
 					{
 						prog->xstatement = st - prog->statements;
 						PRVM_Profile(1<<30, 1000000);
-						PRVM_ERROR("runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", jumpcount, PRVM_NAME);
+						PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
 					}
 				}
 				break;
@@ -258,7 +262,7 @@
 					{
 						prog->xstatement = st - prog->statements;
 						PRVM_Profile(1<<30, 1000000);
-						PRVM_ERROR("runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", jumpcount, PRVM_NAME);
+						PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
 					}
 				}
 				break;
@@ -271,7 +275,7 @@
 				{
 					prog->xstatement = st - prog->statements;
 					PRVM_Profile(1<<30, 1000000);
-					PRVM_ERROR("runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", jumpcount, PRVM_NAME);
+					PRVM_ERROR("%s runaway loop counter hit limit of %d jumps\ntip: read above for list of most-executed functions", PRVM_NAME, jumpcount);
 				}
 				break;
 
@@ -321,7 +325,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;
@@ -329,10 +333,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
 				{
@@ -502,7 +506,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);
@@ -515,14 +519,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);
@@ -541,7 +545,7 @@
 					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;
@@ -553,7 +557,7 @@
 					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];
@@ -569,7 +573,7 @@
 					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];
@@ -587,7 +591,7 @@
 					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];
@@ -600,7 +604,7 @@
 					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  ];
@@ -614,7 +618,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;
 
@@ -624,6 +628,7 @@
 				prog->xfunction->profile += (st - startst);
 				prog->xstatement = st - prog->statements;
 				PRVM_ERROR ("Bad opcode %i in %s", st->op, PRVM_NAME);
+				goto cleanup;
 			}
 		}