prvm_eval_t prvm_badvalue; // used only for error returns
-cvar_t prvm_language = {CVAR_CLIENT | CVAR_SERVER | CVAR_SAVE, "prvm_language", "", "when set, loads PROGSFILE.LANGUAGENAME.po and common.LANGUAGENAME.po for string translations; when set to dump, PROGSFILE.pot is written from the strings in the progs"};
+cvar_t prvm_language = {CF_CLIENT | CF_SERVER | CF_ARCHIVE, "prvm_language", "", "when set, loads PROGSFILE.LANGUAGENAME.po and common.LANGUAGENAME.po for string translations; when set to dump, PROGSFILE.pot is written from the strings in the progs"};
// LadyHavoc: prints every opcode as it executes - warning: this is significant spew
-cvar_t prvm_traceqc = {CVAR_CLIENT | CVAR_SERVER, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"};
+cvar_t prvm_traceqc = {CF_CLIENT | CF_SERVER, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"};
// LadyHavoc: counts usage of each QuakeC statement
-cvar_t prvm_statementprofiling = {CVAR_CLIENT | CVAR_SERVER, "prvm_statementprofiling", "0", "counts how many times each QuakeC statement has been executed, these counts are displayed in prvm_printfunction output (if enabled)"};
-cvar_t prvm_timeprofiling = {CVAR_CLIENT | CVAR_SERVER, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"};
-cvar_t prvm_coverage = {CVAR_CLIENT | CVAR_SERVER, "prvm_coverage", "0", "report and count coverage events (1: per-function, 2: coverage() builtin, 4: per-statement)"};
-cvar_t prvm_backtraceforwarnings = {CVAR_CLIENT | CVAR_SERVER, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"};
-cvar_t prvm_leaktest = {CVAR_CLIENT | CVAR_SERVER, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"};
-cvar_t prvm_leaktest_follow_targetname = {CVAR_CLIENT | CVAR_SERVER, "prvm_leaktest_follow_targetname", "0", "if set, target/targetname links are considered when leak testing; this should normally not be required, as entities created during startup - e.g. info_notnull - are never considered leaky"};
-cvar_t prvm_leaktest_ignore_classnames = {CVAR_CLIENT | CVAR_SERVER, "prvm_leaktest_ignore_classnames", "", "classnames of entities to NOT leak check because they are found by find(world, classname, ...) but are actually spawned by QC code (NOT map entities)"};
-cvar_t prvm_errordump = {CVAR_CLIENT | CVAR_SERVER, "prvm_errordump", "0", "write a savegame on crash to crash-server.dmp"};
-cvar_t prvm_breakpointdump = {CVAR_CLIENT | CVAR_SERVER, "prvm_breakpointdump", "0", "write a savegame on breakpoint to breakpoint-server.dmp"};
-cvar_t prvm_reuseedicts_startuptime = {CVAR_CLIENT | CVAR_SERVER, "prvm_reuseedicts_startuptime", "2", "allows immediate re-use of freed entity slots during start of new level (value in seconds)"};
-cvar_t prvm_reuseedicts_neverinsameframe = {CVAR_CLIENT | CVAR_SERVER, "prvm_reuseedicts_neverinsameframe", "1", "never allows re-use of freed entity slots during same frame"};
-cvar_t prvm_garbagecollection_enable = {CVAR_CLIENT | CVAR_SERVER, "prvm_garbagecollection_enable", "1", "automatically scan for and free resources that are not referenced by the code being executed in the VM"};
-cvar_t prvm_garbagecollection_notify = {CVAR_CLIENT | CVAR_SERVER, "prvm_garbagecollection_notify", "0", "print out a notification for each resource freed by garbage collection"};
-cvar_t prvm_garbagecollection_scan_limit = {CVAR_CLIENT | CVAR_SERVER, "prvm_garbagecollection_scan_limit", "10000", "scan this many fields or resources per frame to free up unreferenced resources"};
-cvar_t prvm_garbagecollection_strings = {CVAR_CLIENT | CVAR_SERVER, "prvm_garbagecollection_strings", "1", "automatically call strunzone() on strings that are not referenced"};
-cvar_t prvm_stringdebug = {CVAR_CLIENT | CVAR_SERVER, "prvm_stringdebug", "0", "Print debug and warning messages related to strings"};
+cvar_t prvm_statementprofiling = {CF_CLIENT | CF_SERVER, "prvm_statementprofiling", "0", "counts how many times each QuakeC statement has been executed, these counts are displayed in prvm_printfunction output (if enabled)"};
+cvar_t prvm_timeprofiling = {CF_CLIENT | CF_SERVER, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"};
+cvar_t prvm_coverage = {CF_CLIENT | CF_SERVER, "prvm_coverage", "0", "report and count coverage events (1: per-function, 2: coverage() builtin, 4: per-statement)"};
+cvar_t prvm_backtraceforwarnings = {CF_CLIENT | CF_SERVER, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"};
+cvar_t prvm_leaktest = {CF_CLIENT | CF_SERVER, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"};
+cvar_t prvm_leaktest_follow_targetname = {CF_CLIENT | CF_SERVER, "prvm_leaktest_follow_targetname", "0", "if set, target/targetname links are considered when leak testing; this should normally not be required, as entities created during startup - e.g. info_notnull - are never considered leaky"};
+cvar_t prvm_leaktest_ignore_classnames = {CF_CLIENT | CF_SERVER, "prvm_leaktest_ignore_classnames", "", "classnames of entities to NOT leak check because they are found by find(world, classname, ...) but are actually spawned by QC code (NOT map entities)"};
+cvar_t prvm_errordump = {CF_CLIENT | CF_SERVER, "prvm_errordump", "0", "write a savegame on crash to crash-server.dmp"};
+cvar_t prvm_breakpointdump = {CF_CLIENT | CF_SERVER, "prvm_breakpointdump", "0", "write a savegame on breakpoint to breakpoint-server.dmp"};
+cvar_t prvm_reuseedicts_startuptime = {CF_CLIENT | CF_SERVER, "prvm_reuseedicts_startuptime", "2", "allows immediate re-use of freed entity slots during start of new level (value in seconds)"};
+cvar_t prvm_reuseedicts_neverinsameframe = {CF_CLIENT | CF_SERVER, "prvm_reuseedicts_neverinsameframe", "1", "never allows re-use of freed entity slots during same frame"};
+cvar_t prvm_garbagecollection_enable = {CF_CLIENT | CF_SERVER, "prvm_garbagecollection_enable", "1", "automatically scan for and free resources that are not referenced by the code being executed in the VM"};
+cvar_t prvm_garbagecollection_notify = {CF_CLIENT | CF_SERVER, "prvm_garbagecollection_notify", "0", "print out a notification for each resource freed by garbage collection"};
+cvar_t prvm_garbagecollection_scan_limit = {CF_CLIENT | CF_SERVER, "prvm_garbagecollection_scan_limit", "10000", "scan this many fields or resources per frame to free up unreferenced resources"};
+cvar_t prvm_garbagecollection_strings = {CF_CLIENT | CF_SERVER, "prvm_garbagecollection_strings", "1", "automatically call strunzone() on strings that are not referenced"};
+cvar_t prvm_stringdebug = {CF_CLIENT | CF_SERVER, "prvm_stringdebug", "0", "Print debug and warning messages related to strings"};
static double prvm_reuseedicts_always_allow = 0;
-qboolean prvm_runawaycheck = true;
+qbool prvm_runawaycheck = true;
//============================================================================
// mempool handling
int PRVM_ED_FindFieldOffset(prvm_prog_t *prog, const char *field)
{
- ddef_t *d;
+ mdef_t *d;
d = PRVM_ED_FindField(prog, field);
if (!d)
return -1;
int PRVM_ED_FindGlobalOffset(prvm_prog_t *prog, const char *global)
{
- ddef_t *d;
+ mdef_t *d;
d = PRVM_ED_FindGlobal(prog, global);
if (!d)
return -1;
void PRVM_ED_ClearEdict(prvm_prog_t *prog, prvm_edict_t *e)
{
memset(e->fields.fp, 0, prog->entityfields * sizeof(prvm_vec_t));
- e->priv.required->free = false;
- e->priv.required->freetime = realtime;
+ e->free = false;
+ e->freetime = host.realtime;
if(e->priv.required->allocation_origin)
Mem_Free((char *)e->priv.required->allocation_origin);
e->priv.required->allocation_origin = PRVM_AllocationOrigin(prog);
Returns if this particular edict could get allocated by PRVM_ED_Alloc
=================
*/
-qboolean PRVM_ED_CanAlloc(prvm_prog_t *prog, prvm_edict_t *e)
+qbool PRVM_ED_CanAlloc(prvm_prog_t *prog, prvm_edict_t *e)
{
- if(!e->priv.required->free)
+ if(!e->free)
return false;
- if(prvm_reuseedicts_always_allow == realtime)
+ if(prvm_reuseedicts_always_allow == host.realtime)
return true;
- if(realtime <= e->priv.required->freetime + 0.1 && prvm_reuseedicts_neverinsameframe.integer)
+ if(host.realtime <= e->freetime + 0.1 && prvm_reuseedicts_neverinsameframe.integer)
return false; // never allow reuse in same frame (causes networking trouble)
- if(e->priv.required->freetime < prog->starttime + prvm_reuseedicts_startuptime.value)
+ if(e->freetime < prog->starttime + prvm_reuseedicts_startuptime.value)
return true;
- if(realtime > e->priv.required->freetime + 1)
+ if(host.realtime > e->freetime + 1)
return true;
return false; // entity slot still blocked because the entity was freed less than one second ago
}
prog->free_edict(prog, ed);
- ed->priv.required->free = true;
- ed->priv.required->freetime = realtime;
+ ed->free = true;
+ ed->freetime = host.realtime;
if(ed->priv.required->allocation_origin)
{
Mem_Free((char *)ed->priv.required->allocation_origin);
PRVM_ED_GlobalAtOfs
============
*/
-static ddef_t *PRVM_ED_GlobalAtOfs (prvm_prog_t *prog, int ofs)
+static mdef_t *PRVM_ED_GlobalAtOfs (prvm_prog_t *prog, unsigned int ofs)
{
- ddef_t *def;
+ mdef_t *def;
int i;
for (i = 0;i < prog->numglobaldefs;i++)
PRVM_ED_FieldAtOfs
============
*/
-ddef_t *PRVM_ED_FieldAtOfs (prvm_prog_t *prog, int ofs)
+mdef_t *PRVM_ED_FieldAtOfs (prvm_prog_t *prog, unsigned int ofs)
{
- ddef_t *def;
+ mdef_t *def;
int i;
for (i = 0;i < prog->numfielddefs;i++)
PRVM_ED_FindField
============
*/
-ddef_t *PRVM_ED_FindField (prvm_prog_t *prog, const char *name)
+mdef_t *PRVM_ED_FindField (prvm_prog_t *prog, const char *name)
{
- ddef_t *def;
+ mdef_t *def;
int i;
for (i = 0;i < prog->numfielddefs;i++)
PRVM_ED_FindGlobal
============
*/
-ddef_t *PRVM_ED_FindGlobal (prvm_prog_t *prog, const char *name)
+mdef_t *PRVM_ED_FindGlobal (prvm_prog_t *prog, const char *name)
{
- ddef_t *def;
+ mdef_t *def;
int i;
for (i = 0;i < prog->numglobaldefs;i++)
return NULL;
}
+/*
+============
+PRVM_ED_FindGlobalEval
+============
+*/
+prvm_eval_t *PRVM_ED_FindGlobalEval(prvm_prog_t *prog, const char *name)
+{
+ mdef_t *def = PRVM_ED_FindGlobal(prog, name);
+ return def ? (prvm_eval_t *) &prog->globals.fp[def->ofs] : NULL;
+}
/*
============
*/
static char *PRVM_ValueString (prvm_prog_t *prog, etype_t type, prvm_eval_t *val, char *line, size_t linelength)
{
- ddef_t *def;
+ mdef_t *def;
mfunction_t *f;
int n;
dpsnprintf (line, linelength, "%s()", PRVM_GetString(prog, f->s_name));
}
else
- dpsnprintf (line, linelength, "function%lli() (invalid!)", val->function);
+ dpsnprintf (line, linelength, "function %" PRVM_PRIi "() (invalid!)", val->function);
break;
case ev_field:
def = PRVM_ED_FieldAtOfs ( prog, val->_int );
if (def != NULL)
dpsnprintf (line, linelength, ".%s", PRVM_GetString(prog, def->s_name));
else
- dpsnprintf (line, linelength, "field%lli (invalid!)", val->_int );
+ dpsnprintf (line, linelength, "field %" PRVM_PRIi " (invalid!)", val->_int );
break;
case ev_void:
dpsnprintf (line, linelength, "void");
break;
case ev_float:
// LadyHavoc: changed from %5.1f to %10.4f
- dpsnprintf (line, linelength, FLOAT_LOSSLESS_FORMAT, val->_float);
+ dpsnprintf (line, linelength, PRVM_FLOAT_LOSSLESS_FORMAT, val->_float);
break;
case ev_vector:
// LadyHavoc: changed from %5.1f to %10.4f
- dpsnprintf (line, linelength, "'" VECTOR_LOSSLESS_FORMAT "'", val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, linelength, "'" PRVM_VECTOR_LOSSLESS_FORMAT "'", val->vector[0], val->vector[1], val->vector[2]);
break;
case ev_pointer:
dpsnprintf (line, linelength, "pointer");
{
int i;
const char *s;
- ddef_t *def;
+ mdef_t *def;
mfunction_t *f;
type = (etype_t)((int)type & ~DEF_SAVEGLOBAL);
strlcpy (line, PRVM_GetString (prog, f->s_name), linelength);
}
else
- dpsnprintf (line, linelength, "bad function %lli (invalid!)", val->function);
+ dpsnprintf (line, linelength, "bad function %" PRVM_PRIi " (invalid!)", val->function);
break;
case ev_field:
def = PRVM_ED_FieldAtOfs ( prog, val->_int );
if (def != NULL)
dpsnprintf (line, linelength, ".%s", PRVM_GetString(prog, def->s_name));
else
- dpsnprintf (line, linelength, "field%lli (invalid!)", val->_int );
+ dpsnprintf (line, linelength, "field %" PRVM_PRIi "(invalid!)", val->_int );
break;
case ev_void:
dpsnprintf (line, linelength, "void");
break;
case ev_float:
- dpsnprintf (line, linelength, FLOAT_LOSSLESS_FORMAT, val->_float);
+ dpsnprintf (line, linelength, PRVM_FLOAT_LOSSLESS_FORMAT, val->_float);
break;
case ev_vector:
- dpsnprintf (line, linelength, VECTOR_LOSSLESS_FORMAT, val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, linelength, PRVM_VECTOR_LOSSLESS_FORMAT, val->vector[0], val->vector[1], val->vector[2]);
break;
default:
dpsnprintf (line, linelength, "bad type %i", type);
{
char *s;
//size_t i;
- ddef_t *def;
+ mdef_t *def;
prvm_eval_t *val;
char valuebuf[MAX_INPUTLINE];
char *PRVM_GlobalStringNoContents (prvm_prog_t *prog, int ofs, char *line, size_t linelength)
{
//size_t i;
- ddef_t *def;
+ mdef_t *def;
def = PRVM_ED_GlobalAtOfs(prog, ofs);
if (!def)
void PRVM_ED_Print(prvm_prog_t *prog, prvm_edict_t *ed, const char *wildcard_fieldname)
{
size_t l;
- ddef_t *d;
+ mdef_t *d;
prvm_eval_t *val;
int i, j;
const char *name;
char tempstring[MAX_INPUTLINE], tempstring2[260]; // temporary string buffers
char valuebuf[MAX_INPUTLINE];
- if (ed->priv.required->free)
+ if (ed->free)
{
Con_Printf("%s: FREE\n",prog->name);
return;
For savegames
=============
*/
-extern cvar_t developer_entityparsing;
void PRVM_ED_Write (prvm_prog_t *prog, qfile_t *f, prvm_edict_t *ed)
{
- ddef_t *d;
+ mdef_t *d;
prvm_eval_t *val;
int i, j;
const char *name;
FS_Print(f, "{\n");
- if (ed->priv.required->free)
+ if (ed->free)
{
FS_Print(f, "}\n");
return;
*/
void PRVM_ED_WriteGlobals (prvm_prog_t *prog, qfile_t *f)
{
- ddef_t *def;
+ mdef_t *def;
int i;
const char *name;
int type;
void PRVM_ED_ParseGlobals (prvm_prog_t *prog, const char *data)
{
char keyname[MAX_INPUTLINE];
- ddef_t *key;
+ mdef_t *key;
while (1)
{
returns false if error
=============
*/
-qboolean PRVM_ED_ParseEpair(prvm_prog_t *prog, prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash)
+qbool PRVM_ED_ParseEpair(prvm_prog_t *prog, prvm_edict_t *ent, mdef_t *key, const char *s, qbool parsebackslash)
{
int i, l;
char *new_p;
- ddef_t *def;
+ mdef_t *def;
prvm_eval_t *val;
mfunction_t *func;
{
prvm_prog_t *prog;
prvm_edict_t *ed;
- ddef_t *key;
+ mdef_t *key;
const char *s;
prvm_eval_t *v;
char valuebuf[MAX_INPUTLINE];
if(Cmd_Argc(cmd) == 5)
{
cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 4), cmd->cvars_flagsmask);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("prvm_edictget: %s is read-only\n", cvar->name);
- goto fail;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar, "prvm_edictget"))
+ goto fail;
+
Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 4), s, cmd->cvars_flagsmask, NULL);
}
else
static void PRVM_ED_GlobalGet_f(cmd_state_t *cmd)
{
prvm_prog_t *prog;
- ddef_t *key;
+ mdef_t *key;
const char *s;
prvm_eval_t *v;
char valuebuf[MAX_INPUTLINE];
if(Cmd_Argc(cmd) == 4)
{
cvar_t *cvar = Cvar_FindVar(cmd->cvars, Cmd_Argv(cmd, 3), cmd->cvars_flagsmask);
- if (cvar && cvar->flags & CVAR_READONLY)
- {
- Con_Printf("prvm_globalget: %s is read-only\n", cvar->name);
- goto fail;
- }
+ if (cvar)
+ if(Cvar_Readonly(cvar, "prvm_globalget"))
+ goto fail;
Cvar_Get(cmd->cvars, Cmd_Argv(cmd, 3), s, cmd->cvars_flagsmask, NULL);
}
else
{
prvm_prog_t *prog;
prvm_edict_t *ed;
- ddef_t *key;
+ mdef_t *key;
if(Cmd_Argc(cmd) != 5)
{
ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(cmd, 2)));
if((key = PRVM_ED_FindField(prog, Cmd_Argv(cmd, 3))) == 0)
- Con_Printf("Key %s not found !\n", Cmd_Argv(cmd, 3));
+ Con_Printf("Key %s not found!\n", Cmd_Argv(cmd, 3));
else
PRVM_ED_ParseEpair(prog, ed, key, Cmd_Argv(cmd, 4), true);
}
*/
const char *PRVM_ED_ParseEdict (prvm_prog_t *prog, const char *data, prvm_edict_t *ent)
{
- ddef_t *key;
- qboolean anglehack;
- qboolean init;
+ mdef_t *key;
+ qbool anglehack;
+ qbool init;
char keyname[256];
size_t n;
}
if (!init) {
- ent->priv.required->free = true;
- ent->priv.required->freetime = realtime;
+ ent->free = true;
+ ent->freetime = host.realtime;
}
return data;
}
+void PRVM_ED_CallPrespawnFunction(prvm_prog_t *prog, prvm_edict_t *ent)
+{
+ if (PRVM_serverfunction(SV_OnEntityPreSpawnFunction))
+ {
+ // self = ent
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPreSpawnFunction), "QC function SV_OnEntityPreSpawnFunction is missing");
+ }
+}
+
+qbool PRVM_ED_CallSpawnFunction(prvm_prog_t *prog, prvm_edict_t *ent, const char *data, const char *start)
+{
+ const char *funcname;
+ mfunction_t *func;
+ prvm_eval_t *fulldata = NULL;
+ char vabuf[1024];
+
+//
+// immediately call spawn function, but only if there is a self global and a classname
+//
+ if (!ent->free)
+ {
+ if (!PRVM_alledictstring(ent, classname))
+ {
+ Con_Print("No classname for:\n");
+ PRVM_ED_Print(prog, ent, NULL);
+ PRVM_ED_Free (prog, ent);
+ return false;
+ }
+ /*
+ * This is required for FTE compatibility (FreeCS).
+ * It copies the key/value pairs themselves into a
+ * global for QC to parse on its own.
+ */
+ else if (data && start)
+ {
+ if((fulldata = PRVM_ED_FindGlobalEval(prog, "__fullspawndata")))
+ {
+ const char *in;
+ char *spawndata;
+ fulldata->string = PRVM_AllocString(prog, data - start + 1, &spawndata);
+ for(in = start; in < data; )
+ {
+ char c = *in++;
+ if(c == '\n')
+ *spawndata++ = '\t';
+ else
+ *spawndata++ = c;
+ }
+ *spawndata = 0;
+ }
+ }
+
+ // look for the spawn function
+ funcname = PRVM_GetString(prog, PRVM_alledictstring(ent, classname));
+ func = PRVM_ED_FindFunction (prog, va(vabuf, sizeof(vabuf), "spawnfunc_%s", funcname));
+ if(!func)
+ if(!PRVM_allglobalfloat(require_spawnfunc_prefix))
+ func = PRVM_ED_FindFunction (prog, funcname);
+
+ if (!func)
+ {
+ // check for OnEntityNoSpawnFunction
+ if (PRVM_serverfunction(SV_OnEntityNoSpawnFunction))
+ {
+ // self = ent
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityNoSpawnFunction), "QC function SV_OnEntityNoSpawnFunction is missing");
+ }
+ else
+ {
+
+ Con_DPrint("No spawn function for:\n");
+ if (developer.integer > 0) // don't confuse non-developers with errors
+ PRVM_ED_Print(prog, ent, NULL);
+
+ PRVM_ED_Free (prog, ent);
+ return false; // not included in "inhibited" count
+ }
+ }
+ else
+ {
+ // self = ent
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_allglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, func - prog->functions, "");
+ }
+ return true;
+ }
+ PRVM_ED_Free(prog, ent);
+ return false;
+}
+
+void PRVM_ED_CallPostspawnFunction (prvm_prog_t *prog, prvm_edict_t *ent)
+{
+ if(!ent->free)
+ if (PRVM_serverfunction(SV_OnEntityPostSpawnFunction))
+ {
+ // self = ent
+ PRVM_serverglobalfloat(time) = sv.time;
+ PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
+ prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPostSpawnFunction), "QC function SV_OnEntityPostSpawnFunction is missing");
+ }
+}
/*
================
void PRVM_ED_LoadFromFile (prvm_prog_t *prog, const char *data)
{
prvm_edict_t *ent;
+ const char *start;
int parsed, inhibited, spawned, died;
- const char *funcname;
- mfunction_t *func;
- char vabuf[1024];
parsed = 0;
inhibited = 0;
spawned = 0;
died = 0;
- prvm_reuseedicts_always_allow = realtime;
+ prvm_reuseedicts_always_allow = host.realtime;
-// parse ents
+ // parse ents
while (1)
{
-// parse the opening brace
+ start = data;
+
+ // parse the opening brace
if (!COM_ParseToken_Simple(&data, false, false, true))
break;
if (com_token[0] != '{')
continue;
}
- if (PRVM_serverfunction(SV_OnEntityPreSpawnFunction))
- {
- // self = ent
- PRVM_serverglobalfloat(time) = sv.time;
- PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
- prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPreSpawnFunction), "QC function SV_OnEntityPreSpawnFunction is missing");
- }
+ PRVM_ED_CallPrespawnFunction(prog, ent);
- if(ent->priv.required->free)
+ if(ent->free)
{
inhibited++;
continue;
}
-//
-// immediately call spawn function, but only if there is a self global and a classname
-//
- if(!ent->priv.required->free)
- {
- if (!PRVM_alledictstring(ent, classname))
- {
- Con_Print("No classname for:\n");
- PRVM_ED_Print(prog, ent, NULL);
- PRVM_ED_Free (prog, ent);
- continue;
- }
-
- // look for the spawn function
- funcname = PRVM_GetString(prog, PRVM_alledictstring(ent, classname));
- func = PRVM_ED_FindFunction (prog, va(vabuf, sizeof(vabuf), "spawnfunc_%s", funcname));
- if(!func)
- if(!PRVM_allglobalfloat(require_spawnfunc_prefix))
- func = PRVM_ED_FindFunction (prog, funcname);
-
- if (!func)
- {
- // check for OnEntityNoSpawnFunction
- if (PRVM_serverfunction(SV_OnEntityNoSpawnFunction))
- {
- // self = ent
- PRVM_serverglobalfloat(time) = sv.time;
- PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
- prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityNoSpawnFunction), "QC function SV_OnEntityNoSpawnFunction is missing");
- }
- else
- {
- if (developer.integer > 0) // don't confuse non-developers with errors
- {
- Con_Print("No spawn function for:\n");
- PRVM_ED_Print(prog, ent, NULL);
- }
- PRVM_ED_Free (prog, ent);
- continue; // not included in "inhibited" count
- }
- }
- else
- {
- // self = ent
- PRVM_serverglobalfloat(time) = sv.time;
- PRVM_allglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
- prog->ExecuteProgram(prog, func - prog->functions, "");
- }
- }
+ SV_LinkEdict(ent);
- if(!ent->priv.required->free)
- if (PRVM_serverfunction(SV_OnEntityPostSpawnFunction))
- {
- // self = ent
- PRVM_serverglobalfloat(time) = sv.time;
- PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent);
- prog->ExecuteProgram(prog, PRVM_serverfunction(SV_OnEntityPostSpawnFunction), "QC function SV_OnEntityPostSpawnFunction is missing");
- }
+ if(!PRVM_ED_CallSpawnFunction(prog, ent, data, start))
+ continue;
+
+ PRVM_ED_CallPostspawnFunction(prog, ent);
spawned++;
- if (ent->priv.required->free)
+ if (ent->free)
died++;
}
case '\\': if(outsize > 0) { *out++ = '\\'; --outsize; } break;
case '"': if(outsize > 0) { *out++ = '"'; --outsize; } break;
case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7':
- if(outsize > 0)
+ if(outsize > 0)
*out = *in - '0';
++in;
if(*in >= '0' && *in <= '7')
memset(&thisstr, 0, sizeof(thisstr));
}
}
-
+
Mem_Free((char *) buf);
}
{
if (prog->loaded)
{
+ if(prog->tempstringsbuf.cursize)
+ Mem_Free(prog->tempstringsbuf.data);
+ prog->tempstringsbuf.cursize = 0;
PRVM_LeakTest(prog);
prog->reset_cmd(prog);
Mem_FreePool(&prog->progs_mempool);
{
int i;
dprograms_t *dprograms;
- dstatement_t *instatements;
- ddef_t *infielddefs;
- ddef_t *inglobaldefs;
+
+ dstatement16_t *instatements16;
+ dstatement32_t *instatements32;
+ ddef16_t *infielddefs16;
+ ddef32_t *infielddefs32;
+ ddef16_t *inglobaldefs16;
+ ddef32_t *inglobaldefs32;
+
int *inglobals;
dfunction_t *infunctions;
char *instrings;
char vabuf[1024];
char vabuf2[1024];
cvar_t *cvar;
+ int structtype = 0;
if (prog->loaded)
prog->error_cmd("PRVM_LoadProgs: there is already a %s program loaded!", prog->name );
// TODO bounds check header fields (e.g. numstatements), they must never go behind end of file
prog->profiletime = Sys_DirtyTime();
- prog->starttime = realtime;
-
- Con_DPrintf("%s programs occupy %iK.\n", prog->name, (int)(filesize/1024));
+ prog->starttime = host.realtime;
requiredglobalspace = 0;
for (i = 0;i < numrequiredglobals;i++)
// byte swap the header
prog->progs_version = LittleLong(dprograms->version);
prog->progs_crc = LittleLong(dprograms->crc);
- if (prog->progs_version != PROG_VERSION)
+ if (prog->progs_version == 7)
+ {
+ dprograms_v7_t *v7 = (dprograms_v7_t*)dprograms;
+ structtype = LittleLong(v7->secondaryversion);
+ if (structtype == PROG_SECONDARYVERSION16 ||
+ structtype == PROG_SECONDARYVERSION32) // barely supported
+ Con_Printf(CON_WARN "WARNING: %s: %s targets FTEQW, for which support is incomplete. Proceed at your own risk.\n", prog->name, filename);
+ else
+ prog->error_cmd("%s: %s targets unknown engine", prog->name, filename);
+
+ if (v7->numbodylessfuncs != 0 || v7->numtypes != 0 || v7->blockscompressed != 0)
+ prog->error_cmd("%s: %s uses unsupported features.", prog->name, filename);
+ }
+ else if (prog->progs_version != PROG_VERSION)
prog->error_cmd("%s: %s has wrong version number (%i should be %i)", prog->name, filename, prog->progs_version, PROG_VERSION);
- instatements = (dstatement_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_statements));
+ instatements16 = (dstatement16_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_statements));
+ instatements32 = (dstatement32_t *)instatements16;
prog->progs_numstatements = LittleLong(dprograms->numstatements);
- inglobaldefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globaldefs));
+ inglobaldefs16 = (ddef16_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globaldefs));
+ inglobaldefs32 = (ddef32_t *)inglobaldefs16;
prog->progs_numglobaldefs = LittleLong(dprograms->numglobaldefs);
- infielddefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_fielddefs));
+ infielddefs16 = (ddef16_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_fielddefs));
+ infielddefs32 = (ddef32_t *)infielddefs16;
prog->progs_numfielddefs = LittleLong(dprograms->numfielddefs);
infunctions = (dfunction_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_functions));
prog->progs_numfunctions = LittleLong(dprograms->numfunctions);
Mem_ExpandableArray_NewArray(&prog->stringbuffersarray, prog->progs_mempool, sizeof(prvm_stringbuffer_t), 64);
// we need to expand the globaldefs and fielddefs to include engine defs
- prog->globaldefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobaldefs + numrequiredglobals) * sizeof(ddef_t));
+ prog->globaldefs = (mdef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobaldefs + numrequiredglobals) * sizeof(mdef_t));
prog->globals.fp = (prvm_vec_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobals + requiredglobalspace + 2) * sizeof(prvm_vec_t));
// + 2 is because of an otherwise occurring overrun in RETURN instruction
// when trying to return the last or second-last global
// (RETURN always returns a vector, there is no RETURN_F instruction)
- prog->fielddefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numfielddefs + numrequiredfields) * sizeof(ddef_t));
+ prog->fielddefs = (mdef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numfielddefs + numrequiredfields) * sizeof(mdef_t));
// we need to convert the statements to our memory format
prog->statements = (mstatement_t *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof(mstatement_t));
// allocate space for profiling statement usage
}
// copy the globaldefs to the new globaldefs list
- for (i=0 ; i<prog->numglobaldefs ; i++)
+ switch(structtype)
{
- prog->globaldefs[i].type = LittleShort(inglobaldefs[i].type);
- prog->globaldefs[i].ofs = LittleShort(inglobaldefs[i].ofs);
- prog->globaldefs[i].s_name = LittleLong(inglobaldefs[i].s_name);
- // TODO bounds check ofs, s_name
+ case PROG_SECONDARYVERSION32:
+ for (i=0 ; i<prog->numglobaldefs ; i++)
+ {
+ prog->globaldefs[i].type = LittleLong(inglobaldefs32[i].type);
+ prog->globaldefs[i].ofs = LittleLong(inglobaldefs32[i].ofs);
+ prog->globaldefs[i].s_name = LittleLong(inglobaldefs32[i].s_name);
+ // TODO bounds check ofs, s_name
+ }
+ break;
+ default:
+ for (i=0 ; i<prog->numglobaldefs ; i++)
+ {
+ prog->globaldefs[i].type = (unsigned short)LittleShort(inglobaldefs16[i].type);
+ prog->globaldefs[i].ofs = (unsigned short)LittleShort(inglobaldefs16[i].ofs);
+ prog->globaldefs[i].s_name = LittleLong(inglobaldefs16[i].s_name);
+ // TODO bounds check ofs, s_name
+ }
+ break;
}
// append the required globals
}
// copy the progs fields to the new fields list
- for (i = 0;i < prog->numfielddefs;i++)
+ switch(structtype)
{
- prog->fielddefs[i].type = LittleShort(infielddefs[i].type);
- if (prog->fielddefs[i].type & DEF_SAVEGLOBAL)
- prog->error_cmd("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", prog->name);
- prog->fielddefs[i].ofs = LittleShort(infielddefs[i].ofs);
- prog->fielddefs[i].s_name = LittleLong(infielddefs[i].s_name);
- // TODO bounds check ofs, s_name
+ case PROG_SECONDARYVERSION32:
+ for (i = 0;i < prog->numfielddefs;i++)
+ {
+ prog->fielddefs[i].type = LittleLong(infielddefs32[i].type);
+ if (prog->fielddefs[i].type & DEF_SAVEGLOBAL)
+ prog->error_cmd("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", prog->name);
+ prog->fielddefs[i].ofs = LittleLong(infielddefs32[i].ofs);
+ prog->fielddefs[i].s_name = LittleLong(infielddefs32[i].s_name);
+ // TODO bounds check ofs, s_name
+ }
+ break;
+ default:
+ for (i = 0;i < prog->numfielddefs;i++)
+ {
+ prog->fielddefs[i].type = (unsigned short)LittleShort(infielddefs16[i].type);
+ if (prog->fielddefs[i].type & DEF_SAVEGLOBAL)
+ prog->error_cmd("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", prog->name);
+ prog->fielddefs[i].ofs = (unsigned short)LittleShort(infielddefs16[i].ofs);
+ prog->fielddefs[i].s_name = LittleLong(infielddefs16[i].s_name);
+ // TODO bounds check ofs, s_name
+ }
+ break;
}
// append the required fields
}
}
- // LadyHavoc: TODO: support 32bit progs statement formats
// copy, remap globals in statements, bounds check
for (i = 0;i < prog->progs_numstatements;i++)
{
- op = (opcode_t)LittleShort(instatements[i].op);
- a = (unsigned short)LittleShort(instatements[i].a);
- b = (unsigned short)LittleShort(instatements[i].b);
- c = (unsigned short)LittleShort(instatements[i].c);
+ switch(structtype)
+ {
+ case PROG_SECONDARYVERSION32:
+ op = (opcode_t)LittleLong(instatements32[i].op);
+ a = (unsigned int)LittleLong(instatements32[i].a);
+ b = (unsigned int)LittleLong(instatements32[i].b);
+ c = (unsigned int)LittleLong(instatements32[i].c);
+ break;
+ default:
+ op = (opcode_t)LittleShort(instatements16[i].op);
+ a = (unsigned short)LittleShort(instatements16[i].a);
+ b = (unsigned short)LittleShort(instatements16[i].b);
+ c = (unsigned short)LittleShort(instatements16[i].c);
+ break;
+ }
switch (op)
{
case OP_IF:
break;
default:
Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", (int)op, i, prog->name);
+
+ //make sure its something well defined.
+ prog->statements[i].op = OP_BOUNDCHECK;
+ prog->statements[i].operand[0] = 0;
+ prog->statements[i].operand[1] =
+ prog->statements[i].operand[2] = op;
+ prog->statements[i].jumpabsolute = -1;
break;
+ case OP_STORE_I:
+ case OP_ADD_I:
+ case OP_ADD_FI:
+ case OP_ADD_IF:
+ case OP_SUB_I:
+ case OP_SUB_FI:
+ case OP_SUB_IF:
+ case OP_CONV_IF:
+ case OP_CONV_FI:
+ case OP_LOAD_I:
+ case OP_STOREP_I:
+ case OP_BITAND_I:
+ case OP_BITOR_I:
+ case OP_MUL_I:
+ case OP_DIV_I:
+ case OP_EQ_I:
+ case OP_NE_I:
+ case OP_NOT_I:
+ case OP_DIV_VF:
+ case OP_STORE_P:
+ case OP_LE_I:
+ case OP_GE_I:
+ case OP_LT_I:
+ case OP_GT_I:
+ case OP_LE_IF:
+ case OP_GE_IF:
+ case OP_LT_IF:
+ case OP_GT_IF:
+ case OP_LE_FI:
+ case OP_GE_FI:
+ case OP_LT_FI:
+ case OP_GT_FI:
+ case OP_EQ_IF:
+ case OP_EQ_FI:
+ case OP_MUL_IF:
+ case OP_MUL_FI:
+ case OP_MUL_VI:
+ case OP_DIV_IF:
+ case OP_DIV_FI:
+ case OP_BITAND_IF:
+ case OP_BITOR_IF:
+ case OP_BITAND_FI:
+ case OP_BITOR_FI:
+ case OP_AND_I:
+ case OP_OR_I:
+ case OP_AND_IF:
+ case OP_OR_IF:
+ case OP_AND_FI:
+ case OP_OR_FI:
+ case OP_NE_IF:
+ case OP_NE_FI:
+ case OP_GSTOREP_I:
+ case OP_GSTOREP_F:
+ case OP_GSTOREP_ENT:
+ case OP_GSTOREP_FLD:
+ case OP_GSTOREP_S:
+ case OP_GSTOREP_FNC:
+ case OP_GSTOREP_V:
+// case OP_GADDRESS:
+ case OP_GLOAD_I:
+ case OP_GLOAD_F:
+ case OP_GLOAD_FLD:
+ case OP_GLOAD_ENT:
+ case OP_GLOAD_S:
+ case OP_GLOAD_FNC:
+ case OP_BOUNDCHECK:
+ case OP_GLOAD_V:
+
// global global global
case OP_ADD_F:
case OP_ADD_V:
case OP_STOREP_FLD:
case OP_STOREP_S:
case OP_STOREP_FNC:
+ if (c) //Spike -- DP is alergic to pointers in QC. Try to avoid too many nasty surprises.
+ Con_DPrintf("PRVM_LoadProgs: storep-with-offset is not permitted in %s\n", prog->name);
+ //fallthrough
case OP_STORE_F:
case OP_STORE_ENT:
case OP_STORE_FLD:
case OP_RETURN:
if ( a >= prog->progs_numglobals)
prog->error_cmd("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, prog->name);
+ if (b || c) //Spike -- added this check just as a diagnostic...
+ Con_DPrintf("PRVM_LoadProgs: unexpected offset on call opcode in %s. Hexen2 format is not supported\n", prog->name);
prog->statements[i].op = op;
prog->statements[i].operand[0] = remapglobal(a);
prog->statements[i].operand[1] = -1;
// in CSQC we really shouldn't be able to change how stuff works... sorry for now
// later idea: include a list of authorized .po file checksums with the csprogs
{
- qboolean deftrans = prog == CLVM_prog;
+ qbool deftrans = prog == CLVM_prog;
const char *realfilename = (prog != CLVM_prog ? filename : csqc_progname.string);
if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method!
{
if(!cvar)
{
const char *value;
- char buf[64];
+ char buf[128];
+ int prec[3];
+ float f;
Con_DPrintf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, prog->name);
switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL)
{
if((float)((int)(val->_float)) == val->_float)
dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float));
else
- dpsnprintf(buf, sizeof(buf), "%.9g", val->_float);
+ {
+ // ftos_slow
+ f = val->_float;
+ for (int precision = 7; precision <= 9; ++precision) {
+ dpsnprintf(buf, sizeof(buf), "%.*g", precision, f);
+ if ((float)atof(buf) == f) {
+ break;
+ }
+ }
+ }
value = buf;
break;
case ev_vector:
- dpsnprintf(buf, sizeof(buf), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); value = buf;
+ for (i = 0; i < 3; ++i)
+ {
+ prec[i] = 9;
+ f = val->vector[i];
+ for (int precision = 7; precision <= 9; ++precision) {
+ dpsnprintf(buf, sizeof(buf), "%.*g", precision, f);
+ if ((float)atof(buf) == f) {
+ prec[i] = precision;
+ break;
+ }
+ }
+ }
+ dpsnprintf(buf, sizeof(buf), "%.*g %.*g %.*g", prec[0], val->vector[0], prec[1], val->vector[1], prec[2], val->vector[2]);
+ value = buf;
break;
case ev_string:
value = PRVM_GetString(prog, val->string);
prog->error_cmd("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, prog->name);
cvar->globaldefindex[prog - prvm_prog_list] = i;
}
- else if((cvar->flags & CVAR_PRIVATE) == 0)
+ else if((cvar->flags & CF_PRIVATE) == 0)
{
// MUST BE SYNCED WITH cvar.c Cvar_Set
int j;
;
}
- prog->loaded = TRUE;
+ prog->loaded = true;
PRVM_UpdateBreakpoints(prog);
- // set flags & ddef_ts in prog
+ // set flags & mdef_ts in prog
prog->flag = 0;
// init mempools
PRVM_MEM_Alloc(prog);
+ Con_Printf("%s: program loaded (crc %i, size %iK)\n", prog->name, prog->filecrc, (int)(filesize/1024));
+
// Inittime is at least the time when this function finished. However,
// later events may bump it.
- prog->inittime = realtime;
+ prog->inittime = host.realtime;
}
char tempstring[MAX_INPUTLINE], tempstring2[260];
const char *name;
prvm_edict_t *ed;
- ddef_t *d;
+ mdef_t *d;
prvm_eval_t *val;
// TODO
for (ednum = 0;ednum < prog->max_edicts;ednum++)
{
ed = PRVM_EDICT_NUM(ednum);
- if (ed->priv.required->free)
+ if (ed->free)
continue;
for (i = 1;i < prog->numfielddefs;i++)
{
static void PRVM_Global_f(cmd_state_t *cmd)
{
prvm_prog_t *prog;
- ddef_t *global;
+ mdef_t *global;
char valuebuf[MAX_INPUTLINE];
if( Cmd_Argc(cmd) != 3 ) {
Con_Printf( "prvm_global <program name> <global name>\n" );
static void PRVM_GlobalSet_f(cmd_state_t *cmd)
{
prvm_prog_t *prog;
- ddef_t *global;
+ mdef_t *global;
if( Cmd_Argc(cmd) != 4 ) {
Con_Printf( "prvm_globalset <program name> <global name> <value>\n" );
return;
Con_Printf("PRVM_Breakpoint: %s\n", text);
PRVM_PrintState(prog, stack_index);
if (prvm_breakpointdump.integer)
- Host_Savegame_to(prog, va(vabuf, sizeof(vabuf), "breakpoint-%s.dmp", prog->name));
+ SV_Savegame_to(prog, va(vabuf, sizeof(vabuf), "breakpoint-%s.dmp", prog->name));
}
void PRVM_Watchpoint(prvm_prog_t *prog, int stack_index, const char *text, etype_t type, prvm_eval_t *o, prvm_eval_t *n)
if (debug->watch_global[0])
{
- ddef_t *global = PRVM_ED_FindGlobal( prog, debug->watch_global );
+ mdef_t *global = PRVM_ED_FindGlobal( prog, debug->watch_global );
if( !global )
{
Con_Printf( "%s progs: no global named '%s' to watch!\n", prog->name, debug->watch_global );
if (debug->watch_field[0])
{
- ddef_t *field = PRVM_ED_FindField( prog, debug->watch_field );
+ mdef_t *field = PRVM_ED_FindField( prog, debug->watch_field );
if( !field )
{
Con_Printf( "%s progs: no field named '%s' to watch!\n", prog->name, debug->watch_field );
*/
void PRVM_Init (void)
{
- Cmd_AddCommand(&cmd_client, "prvm_edict", PRVM_ED_PrintEdict_f, "print all data about an entity number in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_childprofile", PRVM_ChildProfile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu), sorted by time taken in function with child calls");
- Cmd_AddCommand(&cmd_client, "prvm_callprofile", PRVM_CallProfile_f, "prints execution statistics about the most time consuming QuakeC calls from the engine in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_fields", PRVM_Fields_f, "prints usage statistics on properties (how many entities have non-zero values) in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_edictset", PRVM_ED_EdictSet_f, "changes value of a specified property of a specified entity in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "prvm_edictget", PRVM_ED_EdictGet_f, "retrieves the value of a specified property of a specified entity in the selected VM (server, client menu) into a cvar or to the console");
- Cmd_AddCommand(&cmd_client, "prvm_globalget", PRVM_ED_GlobalGet_f, "retrieves the value of a specified global variable in the selected VM (server, client menu) into a cvar or to the console");
- Cmd_AddCommand(&cmd_client, "prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_client, "cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_client, "menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_client, "sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_client, "prvm_breakpoint", PRVM_Breakpoint_f, "marks a statement or function as breakpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear breakpoint");
- Cmd_AddCommand(&cmd_client, "prvm_globalwatchpoint", PRVM_GlobalWatchpoint_f, "marks a global as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
- Cmd_AddCommand(&cmd_client, "prvm_edictwatchpoint", PRVM_EdictWatchpoint_f, "marks an entity field as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
-
- Cmd_AddCommand(&cmd_server, "prvm_edict", PRVM_ED_PrintEdict_f, "print all data about an entity number in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_childprofile", PRVM_ChildProfile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu), sorted by time taken in function with child calls");
- Cmd_AddCommand(&cmd_server, "prvm_callprofile", PRVM_CallProfile_f, "prints execution statistics about the most time consuming QuakeC calls from the engine in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_fields", PRVM_Fields_f, "prints usage statistics on properties (how many entities have non-zero values) in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_edictset", PRVM_ED_EdictSet_f, "changes value of a specified property of a specified entity in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "prvm_edictget", PRVM_ED_EdictGet_f, "retrieves the value of a specified property of a specified entity in the selected VM (server, client menu) into a cvar or to the console");
- Cmd_AddCommand(&cmd_server, "prvm_globalget", PRVM_ED_GlobalGet_f, "retrieves the value of a specified global variable in the selected VM (server, client menu) into a cvar or to the console");
- Cmd_AddCommand(&cmd_server, "prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)");
- Cmd_AddCommand(&cmd_server, "cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_server, "menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_server, "sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
- Cmd_AddCommand(&cmd_server, "prvm_breakpoint", PRVM_Breakpoint_f, "marks a statement or function as breakpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear breakpoint");
- Cmd_AddCommand(&cmd_server, "prvm_globalwatchpoint", PRVM_GlobalWatchpoint_f, "marks a global as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
- Cmd_AddCommand(&cmd_server, "prvm_edictwatchpoint", PRVM_EdictWatchpoint_f, "marks an entity field as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
+ Cmd_AddCommand(CF_SHARED, "prvm_edict", PRVM_ED_PrintEdict_f, "print all data about an entity number in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_childprofile", PRVM_ChildProfile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu), sorted by time taken in function with child calls");
+ Cmd_AddCommand(CF_SHARED, "prvm_callprofile", PRVM_CallProfile_f, "prints execution statistics about the most time consuming QuakeC calls from the engine in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_fields", PRVM_Fields_f, "prints usage statistics on properties (how many entities have non-zero values) in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_edictset", PRVM_ED_EdictSet_f, "changes value of a specified property of a specified entity in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "prvm_edictget", PRVM_ED_EdictGet_f, "retrieves the value of a specified property of a specified entity in the selected VM (server, client menu) into a cvar or to the console");
+ Cmd_AddCommand(CF_SHARED, "prvm_globalget", PRVM_ED_GlobalGet_f, "retrieves the value of a specified global variable in the selected VM (server, client menu) into a cvar or to the console");
+ Cmd_AddCommand(CF_SHARED, "prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)");
+ Cmd_AddCommand(CF_SHARED, "cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument");
+ Cmd_AddCommand(CF_SHARED, "menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument");
+ Cmd_AddCommand(CF_SHARED, "sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument");
+ Cmd_AddCommand(CF_SHARED, "prvm_breakpoint", PRVM_Breakpoint_f, "marks a statement or function as breakpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear breakpoint");
+ Cmd_AddCommand(CF_SHARED, "prvm_globalwatchpoint", PRVM_GlobalWatchpoint_f, "marks a global as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
+ Cmd_AddCommand(CF_SHARED, "prvm_edictwatchpoint", PRVM_EdictWatchpoint_f, "marks an entity field as watchpoint (when this is executed, a stack trace is printed); to actually halt and investigate state, combine this with a gdb breakpoint on PRVM_Breakpoint, or with prvm_breakpointdump; run with just progs name to clear watchpoint");
Cvar_RegisterVariable (&prvm_language);
Cvar_RegisterVariable (&prvm_traceqc);
Cvar_RegisterVariable (&prvm_stringdebug);
// COMMANDLINEOPTION: PRVM: -norunaway disables the runaway loop check (it might be impossible to exit DarkPlaces if used!)
- prvm_runawaycheck = !COM_CheckParm("-norunaway");
+ prvm_runawaycheck = !Sys_CheckParm("-norunaway");
//VM_Cmd_Init();
}
return PRVM_KNOWNSTRINGBASE + i;
// new unknown engine string
if (developer_insane.integer)
- Con_DPrintf("new engine string %p = \"%s\"\n", s, s);
+ Con_DPrintf("new engine string %p = \"%s\"\n", (void *)s, s);
for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
if (!prog->knownstrings[i])
break;
for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
if (!prog->knownstrings[i])
break;
- s = PRVM_Alloc(bufferlength);
+ s = (char *)PRVM_Alloc(bufferlength);
PRVM_NewKnownString(prog, i, KNOWNSTRINGFLAG_GCMARK, s);
if(prog->leaktest_active)
prog->knownstrings_origin[i] = PRVM_AllocationOrigin(prog);
prog->error_cmd("PRVM_FreeString: invalid string offset %i", num);
}
-static qboolean PRVM_IsStringReferenced(prvm_prog_t *prog, string_t string)
+static qbool PRVM_IsStringReferenced(prvm_prog_t *prog, string_t string)
{
int i, j;
for (i = 0;i < prog->numglobaldefs;i++)
{
- ddef_t *d = &prog->globaldefs[i];
+ mdef_t *d = &prog->globaldefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
if(string == PRVM_GLOBALFIELDSTRING(d->ofs))
for(j = 0; j < prog->num_edicts; ++j)
{
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
- if (ed->priv.required->free)
+ if (ed->free)
continue;
for (i=0; i<prog->numfielddefs; ++i)
{
- ddef_t *d = &prog->fielddefs[i];
+ mdef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string)
continue;
if(string == PRVM_EDICTFIELDSTRING(ed, d->ofs))
return false;
}
-static qboolean PRVM_IsEdictRelevant(prvm_prog_t *prog, prvm_edict_t *edict)
+static qbool PRVM_IsEdictRelevant(prvm_prog_t *prog, prvm_edict_t *edict)
{
char vabuf[1024];
char vabuf2[1024];
if(PRVM_NUM_FOR_EDICT(edict) <= prog->reserved_edicts)
return true; // world or clients
- if (edict->priv.required->freetime <= prog->inittime)
+ if (edict->freetime <= prog->inittime)
return true; // created during startup
if (prog == SVVM_prog)
{
return false;
}
-static qboolean PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, int mark)
+static qbool PRVM_IsEdictReferenced(prvm_prog_t *prog, prvm_edict_t *edict, int mark)
{
int i, j;
int edictnum = PRVM_NUM_FOR_EDICT(edict);
}
for (i=0; i<prog->numfielddefs; ++i)
{
- ddef_t *d = &prog->fielddefs[i];
+ mdef_t *d = &prog->fielddefs[i];
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
continue;
if(edictnum == PRVM_EDICTFIELDEDICT(ed, d->ofs))
static void PRVM_MarkReferencedEdicts(prvm_prog_t *prog)
{
int i, j;
- qboolean found_new;
+ qbool found_new;
int stage;
// Stage 1: world, all entities that are relevant, and all entities that are referenced by globals.
for(j = 0; j < prog->num_edicts; ++j)
{
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
- if(ed->priv.required->free)
+ if(ed->free)
continue;
ed->priv.required->mark = PRVM_IsEdictRelevant(prog, ed) ? stage : 0;
}
for (i = 0;i < prog->numglobaldefs;i++)
{
- ddef_t *d = &prog->globaldefs[i];
+ mdef_t *d = &prog->globaldefs[i];
prvm_edict_t *ed;
if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity)
continue;
for(j = 0; j < prog->num_edicts; ++j)
{
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
- if(ed->priv.required->free)
+ if(ed->free)
continue;
if(ed->priv.required->mark)
continue;
void PRVM_LeakTest(prvm_prog_t *prog)
{
int i, j;
- qboolean leaked = false;
+ qbool leaked = false;
if(!prog->leaktest_active)
return;
for(j = 0; j < prog->num_edicts; ++j)
{
prvm_edict_t *ed = PRVM_EDICT_NUM(j);
- if(ed->priv.required->free)
+ if(ed->free)
continue;
if(!ed->priv.required->mark)
if(ed->priv.required->allocation_origin)
case PRVM_GC_GLOBALS_MARK:
for (; gc->globals_mark_progress < prog->numglobaldefs && (limit--) > 0; gc->globals_mark_progress++)
{
- ddef_t *d = &prog->globaldefs[gc->globals_mark_progress];
+ mdef_t *d = &prog->globaldefs[gc->globals_mark_progress];
switch (d->type)
{
case ev_string:
case PRVM_GC_FIELDS_MARK:
for (; gc->fields_mark_progress < prog->numfielddefs && limit > 0;)
{
- ddef_t *d = &prog->fielddefs[gc->fields_mark_progress];
+ mdef_t *d = &prog->fielddefs[gc->fields_mark_progress];
switch (d->type)
{
case ev_string:
projects / xonotic / darkplaces.git / blobdiff