X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_edict.c;h=fcc0b5317d0ca0b0fe331ad8a05881b139643c0a;hp=1ccfc36ab08d0bf3a96326dc761432706e2d74c4;hb=8c6898ab1f01b8efd78fea454b3f8654c4265ebb;hpb=56ba064e5d764afe2f3e6f4bee937b4dbff3638e diff --git a/prvm_edict.c b/prvm_edict.c index 1ccfc36a..fcc0b531 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "progsvm.h" +#include "csprogs.h" prvm_prog_t *prog; @@ -28,21 +29,26 @@ static prvm_prog_t prog_list[PRVM_MAXPROGS]; int prvm_type_size[8] = {1,sizeof(string_t)/4,1,3,1,1,sizeof(func_t)/4,sizeof(void *)/4}; +prvm_eval_t prvm_badvalue; // used only for error returns + ddef_t *PRVM_ED_FieldAtOfs(int ofs); qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qboolean parsebackslash); -// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others)) -#ifdef PRVM_BOUNDSCHECK_CVAR -cvar_t prvm_boundscheck = {0, "prvm_boundscheck", "1", "enables detection of out of bounds memory access in the QuakeC code being run (in other words, prevents really exceedingly bad QuakeC code from doing nasty things to your computer)"}; -#endif +cvar_t prvm_language = {CVAR_SAVE, "prvm_language", "", "when set, loads progs.dat.LANGUAGENAME.po for string translations; when set to dump, progs.dat.pot is written from the strings in the progs"}; // LordHavoc: prints every opcode as it executes - warning: this is significant spew cvar_t prvm_traceqc = {0, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"}; // LordHavoc: counts usage of each QuakeC statement cvar_t prvm_statementprofiling = {0, "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 = {0, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"}; cvar_t prvm_backtraceforwarnings = {0, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"}; cvar_t prvm_leaktest = {0, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"}; cvar_t prvm_leaktest_ignore_classnames = {0, "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 = {0, "prvm_errordump", "0", "write a savegame on crash to crash-server.dmp"}; +cvar_t prvm_reuseedicts_startuptime = {0, "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 = {0, "prvm_reuseedicts_neverinsameframe", "1", "never allows re-use of freed entity slots during same frame"}; + +static double prvm_reuseedicts_always_allow = 0; +qboolean prvm_runawaycheck = true; extern sizebuf_t vm_tempstringsbuf; @@ -73,13 +79,14 @@ void PRVM_MEM_Alloc(void) prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size); // alloc edict fields - prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size); + prog->entityfieldsarea = prog->entityfields * prog->max_edicts; + prog->edictsfields = (vec_t *)Mem_Alloc(prog->progs_mempool, prog->entityfieldsarea * sizeof(vec_t)); // set edict pointers for(i = 0; i < prog->max_edicts; i++) { prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size); - prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size); + prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields; } } @@ -91,9 +98,6 @@ PRVM_MEM_IncreaseEdicts void PRVM_MEM_IncreaseEdicts(void) { int i; - int oldmaxedicts = prog->max_edicts; - void *oldedictsfields = prog->edictsfields; - void *oldedictprivate = prog->edictprivate; if(prog->max_edicts >= prog->limit_edicts) return; @@ -103,23 +107,18 @@ void PRVM_MEM_IncreaseEdicts(void) // increase edicts prog->max_edicts = min(prog->max_edicts + 256, prog->limit_edicts); - prog->edictsfields = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edict_size); - prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size); - - memcpy(prog->edictsfields, oldedictsfields, oldmaxedicts * prog->edict_size); - memcpy(prog->edictprivate, oldedictprivate, oldmaxedicts * prog->edictprivate_size); + prog->entityfieldsarea = prog->entityfields * prog->max_edicts; + prog->edictsfields = (vec_t*)Mem_Realloc(prog->progs_mempool, (void *)prog->edictsfields, prog->entityfieldsarea * sizeof(vec_t)); + prog->edictprivate = (void *)Mem_Realloc(prog->progs_mempool, (void *)prog->edictprivate, prog->max_edicts * prog->edictprivate_size); //set e and v pointers for(i = 0; i < prog->max_edicts; i++) { prog->edicts[i].priv.required = (prvm_edict_private_t *)((unsigned char *)prog->edictprivate + i * prog->edictprivate_size); - prog->edicts[i].fields.vp = (void*)((unsigned char *)prog->edictsfields + i * prog->edict_size); + prog->edicts[i].fields.vp = prog->edictsfields + i * prog->entityfields; } PRVM_GCALL(end_increase_edicts)(); - - Mem_Free(oldedictsfields); - Mem_Free(oldedictprivate); } //============================================================================ @@ -215,14 +214,14 @@ Sets everything to NULL */ void PRVM_ED_ClearEdict (prvm_edict_t *e) { - memset (e->fields.vp, 0, prog->progs->entityfields * 4); + memset (e->fields.vp, 0, prog->entityfields * 4); e->priv.required->free = false; // AK: Let the init_edict function determine if something needs to be initialized PRVM_GCALL(init_edict)(e); } -const char *PRVM_AllocationOrigin() +const char *PRVM_AllocationOrigin(void) { char *buf = NULL; if(prog->leaktest_active) @@ -234,6 +233,28 @@ const char *PRVM_AllocationOrigin() return buf; } +/* +================= +PRVM_ED_CanAlloc + +Returns if this particular edict could get allocated by PRVM_ED_Alloc +================= +*/ +qboolean PRVM_ED_CanAlloc(prvm_edict_t *e) +{ + if(!e->priv.required->free) + return false; + if(prvm_reuseedicts_always_allow == realtime) + return true; + if(realtime <= e->priv.required->freetime && 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) + return true; + if(realtime > e->priv.required->freetime + 1) + return true; + return false; // entity slot still blocked because the entity was freed less than one second ago +} + /* ================= PRVM_ED_Alloc @@ -258,9 +279,7 @@ prvm_edict_t *PRVM_ED_Alloc (void) for (i = prog->reserved_edicts + 1;i < prog->num_edicts;i++) { e = PRVM_EDICT_NUM(i); - // the first couple seconds of server time can involve a lot of - // freeing and allocating, so relax the replacement policy - if (e->priv.required->free && ( e->priv.required->freetime < 2 || prog->globaloffsets.time < 0 || (PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float - e->priv.required->freetime) > 0.5 ) ) + if(PRVM_ED_CanAlloc(e)) { PRVM_ED_ClearEdict (e); e->priv.required->allocation_origin = PRVM_AllocationOrigin(); @@ -300,7 +319,7 @@ void PRVM_ED_Free (prvm_edict_t *ed) PRVM_GCALL(free_edict)(ed); ed->priv.required->free = true; - ed->priv.required->freetime = prog->globaloffsets.time >= 0 ? PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float : 0; + ed->priv.required->freetime = realtime; if(ed->priv.required->allocation_origin) { PRVM_Free((char *)ed->priv.required->allocation_origin); @@ -320,7 +339,7 @@ ddef_t *PRVM_ED_GlobalAtOfs (int ofs) ddef_t *def; int i; - for (i=0 ; iprogs->numglobaldefs ; i++) + for (i = 0;i < prog->numglobaldefs;i++) { def = &prog->globaldefs[i]; if (def->ofs == ofs) @@ -339,7 +358,7 @@ ddef_t *PRVM_ED_FieldAtOfs (int ofs) ddef_t *def; int i; - for (i=0 ; iprogs->numfielddefs ; i++) + for (i = 0;i < prog->numfielddefs;i++) { def = &prog->fielddefs[i]; if (def->ofs == ofs) @@ -358,7 +377,7 @@ ddef_t *PRVM_ED_FindField (const char *name) ddef_t *def; int i; - for (i=0 ; iprogs->numfielddefs ; i++) + for (i = 0;i < prog->numfielddefs;i++) { def = &prog->fielddefs[i]; if (!strcmp(PRVM_GetString(def->s_name), name)) @@ -377,7 +396,7 @@ ddef_t *PRVM_ED_FindGlobal (const char *name) ddef_t *def; int i; - for (i=0 ; iprogs->numglobaldefs ; i++) + for (i = 0;i < prog->numglobaldefs;i++) { def = &prog->globaldefs[i]; if (!strcmp(PRVM_GetString(def->s_name), name)) @@ -397,7 +416,7 @@ mfunction_t *PRVM_ED_FindFunction (const char *name) mfunction_t *func; int i; - for (i=0 ; iprogs->numfunctions ; i++) + for (i = 0;i < prog->numfunctions;i++) { func = &prog->functions[i]; if (!strcmp(PRVM_GetString(func->s_name), name)) @@ -430,7 +449,7 @@ char *PRVM_ValueString (etype_t type, prvm_eval_t *val) break; case ev_entity: n = val->edict; - if (n < 0 || n >= prog->limit_edicts) + if (n < 0 || n >= prog->max_edicts) dpsnprintf (line, sizeof(line), "entity %i (invalid!)", n); else dpsnprintf (line, sizeof(line), "entity %i", n); @@ -507,6 +526,11 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val) line[i++] = '\\'; line[i++] = '\\'; } + else if (*s == '"') + { + line[i++] = '\\'; + line[i++] = '"'; + } else line[i++] = *s; s++; @@ -528,10 +552,10 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val) dpsnprintf (line, sizeof (line), "void"); break; case ev_float: - dpsnprintf (line, sizeof (line), "%f", val->_float); + dpsnprintf (line, sizeof (line), "%.9g", val->_float); break; case ev_vector: - dpsnprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]); + dpsnprintf (line, sizeof (line), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); break; default: dpsnprintf (line, sizeof (line), "bad type %i", type); @@ -623,11 +647,11 @@ void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname) tempstring[0] = 0; dpsnprintf(tempstring, sizeof(tempstring), "\n%s EDICT %i:\n", PRVM_NAME, PRVM_NUM_FOR_EDICT(ed)); - for (i=1 ; iprogs->numfielddefs ; i++) + for (i = 1;i < prog->numfielddefs;i++) { d = &prog->fielddefs[i]; name = PRVM_GetString(d->s_name); - if (name[strlen(name)-2] == '_') + if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) continue; // skip _x, _y, _z vars // Check Field Name Wildcard @@ -636,7 +660,7 @@ void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname) // Didn't match; skip continue; - v = (int *)((char *)ed->fields.vp + d->ofs*4); + v = (int *)(ed->fields.vp + d->ofs); // if the value is still all 0, skip the field type = d->type & ~DEF_SAVEGLOBAL; @@ -686,6 +710,7 @@ PRVM_ED_Write For savegames ============= */ +extern cvar_t developer_entityparsing; void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) { ddef_t *d; @@ -702,14 +727,19 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) return; } - for (i=1 ; iprogs->numfielddefs ; i++) + for (i = 1;i < prog->numfielddefs;i++) { d = &prog->fielddefs[i]; name = PRVM_GetString(d->s_name); - if (name[strlen(name)-2] == '_') - continue; // skip _x, _y, _z vars - v = (int *)((char *)ed->fields.vp + d->ofs*4); + if(developer_entityparsing.integer) + Con_Printf("PRVM_ED_Write: at entity %d field %s\n", PRVM_NUM_FOR_EDICT(ed), name); + + //if(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) + if(strlen(name) > 1 && name[strlen(name)-2] == '_') + continue; // skip _x, _y, _z vars, and ALSO other _? vars as some mods expect them to be never saved (TODO: a gameplayfix for using the "more precise" condition above?) + + v = (int *)(ed->fields.vp + d->ofs); // if the value is still all 0, skip the field type = d->type & ~DEF_SAVEGLOBAL; @@ -720,7 +750,9 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) continue; FS_Printf(f,"\"%s\" ",name); + prog->statestring = va("PRVM_ED_Write, ent=%d, name=%s", i, name); FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v)); + prog->statestring = NULL; } FS_Print(f, "}\n"); @@ -872,7 +904,7 @@ void PRVM_ED_WriteGlobals (qfile_t *f) int type; FS_Print(f,"{\n"); - for (i=0 ; iprogs->numglobaldefs ; i++) + for (i = 0;i < prog->numglobaldefs;i++) { def = &prog->globaldefs[i]; type = def->type; @@ -884,8 +916,14 @@ void PRVM_ED_WriteGlobals (qfile_t *f) continue; name = PRVM_GetString(def->s_name); + + if(developer_entityparsing.integer) + Con_Printf("PRVM_ED_WriteGlobals: at global %s\n", name); + + prog->statestring = va("PRVM_ED_WriteGlobals, name=%s", name); FS_Printf(f,"\"%s\" ", name); FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs])); + prog->statestring = NULL; } FS_Print(f,"}\n"); } @@ -908,12 +946,18 @@ void PRVM_ED_ParseGlobals (const char *data) if (com_token[0] == '}') break; + if (developer_entityparsing.integer) + Con_Printf("Key: \"%s\"", com_token); + strlcpy (keyname, com_token, sizeof(keyname)); // parse value if (!COM_ParseToken_Simple(&data, false, true)) PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace"); + if (developer_entityparsing.integer) + Con_Printf(" \"%s\"\n", com_token); + if (com_token[0] == '}') PRVM_ERROR ("PRVM_ED_ParseGlobals: closing brace without data"); @@ -949,9 +993,9 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qbool mfunction_t *func; if (ent) - val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs); + val = (prvm_eval_t *)(ent->fields.vp + key->ofs); else - val = (prvm_eval_t *)((int *)prog->globals.generic + key->ofs); + val = (prvm_eval_t *)(prog->globals.generic + key->ofs); switch (key->type & ~DEF_SAVEGLOBAL) { case ev_string: @@ -975,7 +1019,7 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qbool break; case ev_float: - while (*s && *s <= ' ') + while (*s && ISWHITESPACE(*s)) s++; val->_float = atof(s); break; @@ -983,12 +1027,12 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qbool case ev_vector: for (i = 0;i < 3;i++) { - while (*s && *s <= ' ') + while (*s && ISWHITESPACE(*s)) s++; if (!*s) break; val->vector[i] = atof(s); - while (*s > ' ') + while (!ISWHITESPACE(*s)) s++; if (!*s) break; @@ -996,16 +1040,16 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s, qbool break; case ev_entity: - while (*s && *s <= ' ') + while (*s && ISWHITESPACE(*s)) s++; i = atoi(s); if (i >= prog->limit_edicts) - Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, (unsigned int)MAX_EDICTS, PRVM_NAME); + Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %u >= MAX_EDICTS %u) on %s\n", (unsigned int)i, prog->limit_edicts, PRVM_NAME); while (i >= prog->max_edicts) PRVM_MEM_IncreaseEdicts(); // if IncreaseEdicts was called the base pointer needs to be updated if (ent) - val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs); + val = (prvm_eval_t *)(ent->fields.vp + key->ofs); val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i)); break; @@ -1074,7 +1118,7 @@ void PRVM_GameCommand(const char *whichprogs, const char *whichcmd) return; } - if(!prog->funcoffsets.GameCommand) + if(!PRVM_allfunction(GameCommand)) { Con_Printf("%s program do not support GameCommand!\n", whichprogs); } @@ -1087,7 +1131,7 @@ void PRVM_GameCommand(const char *whichprogs, const char *whichcmd) restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(s ? s : ""); - PRVM_ExecuteProgram (prog->funcoffsets.GameCommand, "QC function GameCommand is missing"); + PRVM_ExecuteProgram (PRVM_allfunction(GameCommand), "QC function GameCommand is missing"); vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; } @@ -1106,6 +1150,105 @@ void PRVM_GameCommand_Menu_f(void) PRVM_GameCommand("menu", "menu_cmd"); } +/* +============= +PRVM_ED_EdictGet_f + +Console command to load a field of a specified edict +============= +*/ +void PRVM_ED_EdictGet_f(void) +{ + prvm_edict_t *ed; + ddef_t *key; + const char *s; + prvm_eval_t *v; + + if(Cmd_Argc() != 4 && Cmd_Argc() != 5) + { + Con_Print("prvm_edictget []\n"); + return; + } + + PRVM_Begin; + if(!PRVM_SetProgFromString(Cmd_Argv(1))) + { + Con_Printf("Wrong program name %s !\n", Cmd_Argv(1)); + return; + } + + ed = PRVM_EDICT_NUM(atoi(Cmd_Argv(2))); + + if((key = PRVM_ED_FindField(Cmd_Argv(3))) == 0) + { + Con_Printf("Key %s not found !\n", Cmd_Argv(3)); + goto fail; + } + + v = (prvm_eval_t *)(ed->fields.vp + key->ofs); + s = PRVM_UglyValueString((etype_t)key->type, v); + if(Cmd_Argc() == 5) + { + cvar_t *cvar = Cvar_FindVar(Cmd_Argv(4)); + if (cvar && cvar->flags & CVAR_READONLY) + { + Con_Printf("prvm_edictget: %s is read-only\n", cvar->name); + goto fail; + } + Cvar_Get(Cmd_Argv(4), s, 0, NULL); + } + else + Con_Printf("%s\n", s); + +fail: + PRVM_End; +} + +void PRVM_ED_GlobalGet_f(void) +{ + ddef_t *key; + const char *s; + prvm_eval_t *v; + + if(Cmd_Argc() != 3 && Cmd_Argc() != 4) + { + Con_Print("prvm_globalget []\n"); + return; + } + + PRVM_Begin; + if(!PRVM_SetProgFromString(Cmd_Argv(1))) + { + Con_Printf("Wrong program name %s !\n", Cmd_Argv(1)); + return; + } + + key = PRVM_ED_FindGlobal(Cmd_Argv(2)); + if(!key) + { + Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) ); + goto fail; + } + + v = (prvm_eval_t *) &prog->globals.generic[key->ofs]; + s = PRVM_UglyValueString((etype_t)key->type, v); + if(Cmd_Argc() == 4) + { + cvar_t *cvar = Cvar_FindVar(Cmd_Argv(3)); + if (cvar && cvar->flags & CVAR_READONLY) + { + Con_Printf("prvm_globalget: %s is read-only\n", cvar->name); + goto fail; + } + Cvar_Get(Cmd_Argv(3), s, 0, NULL); + } + else + Con_Printf("%s\n", s); + +fail: + PRVM_End; +} + /* ============= PRVM_ED_EdictSet_f @@ -1150,7 +1293,6 @@ ed should be a properly initialized empty edict. Used for initial level load and for savegames. ==================== */ -extern cvar_t developer_entityparsing; const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) { ddef_t *key; @@ -1268,6 +1410,7 @@ void PRVM_ED_LoadFromFile (const char *data) spawned = 0; died = 0; + prvm_reuseedicts_always_allow = realtime; // parse ents while (1) @@ -1289,7 +1432,7 @@ void PRVM_ED_LoadFromFile (const char *data) // clear it if (ent != prog->edicts) // hack - memset (ent->fields.vp, 0, prog->progs->entityfields * 4); + memset (ent->fields.vp, 0, prog->entityfields * 4); data = PRVM_ED_ParseEdict (data, ent); parsed++; @@ -1302,13 +1445,25 @@ void PRVM_ED_LoadFromFile (const char *data) continue; } + if (PRVM_serverfunction(SV_OnEntityPreSpawnFunction)) + { + // self = ent + PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + PRVM_ExecuteProgram (PRVM_serverfunction(SV_OnEntityPreSpawnFunction), "QC function SV_OnEntityPreSpawnFunction is missing"); + } + + if(ent->priv.required->free) + { + inhibited++; + continue; + } + // // immediately call spawn function, but only if there is a self global and a classname // - if(prog->globaloffsets.self >= 0 && prog->fieldoffsets.classname >= 0) + if(!ent->priv.required->free) { - string_t handle = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.classname)->string; - if (!handle) + if (!PRVM_alledictstring(ent, classname)) { Con_Print("No classname for:\n"); PRVM_ED_Print(ent, NULL); @@ -1317,46 +1472,56 @@ void PRVM_ED_LoadFromFile (const char *data) } // look for the spawn function - funcname = PRVM_GetString(handle); + funcname = PRVM_GetString(PRVM_alledictstring(ent, classname)); func = PRVM_ED_FindFunction (va("spawnfunc_%s", funcname)); if(!func) - if(prog->globaloffsets.require_spawnfunc_prefix < 0) + if(!PRVM_allglobalfloat(require_spawnfunc_prefix)) func = PRVM_ED_FindFunction (funcname); if (!func) { // check for OnEntityNoSpawnFunction - if (prog->funcoffsets.SV_OnEntityNoSpawnFunction) + if (PRVM_serverfunction(SV_OnEntityNoSpawnFunction)) { // self = ent - PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram (prog->funcoffsets.SV_OnEntityNoSpawnFunction, "QC function SV_OnEntityNoSpawnFunction is missing"); + PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + PRVM_ExecuteProgram (PRVM_serverfunction(SV_OnEntityNoSpawnFunction), "QC function SV_OnEntityNoSpawnFunction is missing"); } else { - if (developer.integer) // don't confuse non-developers with errors + if (developer.integer > 0) // don't confuse non-developers with errors { Con_Print("No spawn function for:\n"); PRVM_ED_Print(ent, NULL); } PRVM_ED_Free (ent); - continue; + continue; // not included in "inhibited" count } } else { // self = ent - PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent); + PRVM_allglobaledict(self) = PRVM_EDICT_TO_PROG(ent); PRVM_ExecuteProgram (func - prog->functions, ""); } } + if(!ent->priv.required->free) + if (PRVM_serverfunction(SV_OnEntityPostSpawnFunction)) + { + // self = ent + PRVM_serverglobaledict(self) = PRVM_EDICT_TO_PROG(ent); + PRVM_ExecuteProgram (PRVM_serverfunction(SV_OnEntityPostSpawnFunction), "QC function SV_OnEntityPostSpawnFunction is missing"); + } + spawned++; if (ent->priv.required->free) died++; } Con_DPrintf("%s: %i new entities parsed, %i new inhibited, %i (%i new) spawned (whereas %i removed self, %i stayed)\n", PRVM_NAME, parsed, inhibited, prog->num_edicts, spawned, died, spawned - died); + + prvm_reuseedicts_always_allow = 0; } void PRVM_FindOffsets(void) @@ -1364,159 +1529,81 @@ void PRVM_FindOffsets(void) // field and global searches use -1 for NULL memset(&prog->fieldoffsets, -1, sizeof(prog->fieldoffsets)); memset(&prog->globaloffsets, -1, sizeof(prog->globaloffsets)); - // functions use 0 for NULL + // function searches use 0 for NULL memset(&prog->funcoffsets, 0, sizeof(prog->funcoffsets)); - - // server and client qc use a lot of similar fields, so this is combined - prog->fieldoffsets.SendEntity = PRVM_ED_FindFieldOffset("SendEntity"); - prog->fieldoffsets.Version = PRVM_ED_FindFieldOffset("Version"); - prog->fieldoffsets.alpha = PRVM_ED_FindFieldOffset("alpha"); - prog->fieldoffsets.ammo_cells1 = PRVM_ED_FindFieldOffset("ammo_cells1"); - prog->fieldoffsets.ammo_lava_nails = PRVM_ED_FindFieldOffset("ammo_lava_nails"); - prog->fieldoffsets.ammo_multi_rockets = PRVM_ED_FindFieldOffset("ammo_multi_rockets"); - prog->fieldoffsets.ammo_nails1 = PRVM_ED_FindFieldOffset("ammo_nails1"); - prog->fieldoffsets.ammo_plasma = PRVM_ED_FindFieldOffset("ammo_plasma"); - prog->fieldoffsets.ammo_rockets1 = PRVM_ED_FindFieldOffset("ammo_rockets1"); - prog->fieldoffsets.ammo_shells1 = PRVM_ED_FindFieldOffset("ammo_shells1"); - prog->fieldoffsets.angles = PRVM_ED_FindFieldOffset("angles"); - prog->fieldoffsets.button3 = PRVM_ED_FindFieldOffset("button3"); - prog->fieldoffsets.button4 = PRVM_ED_FindFieldOffset("button4"); - prog->fieldoffsets.button5 = PRVM_ED_FindFieldOffset("button5"); - prog->fieldoffsets.button6 = PRVM_ED_FindFieldOffset("button6"); - prog->fieldoffsets.button7 = PRVM_ED_FindFieldOffset("button7"); - prog->fieldoffsets.button8 = PRVM_ED_FindFieldOffset("button8"); - prog->fieldoffsets.button9 = PRVM_ED_FindFieldOffset("button9"); - prog->fieldoffsets.button10 = PRVM_ED_FindFieldOffset("button10"); - prog->fieldoffsets.button11 = PRVM_ED_FindFieldOffset("button11"); - prog->fieldoffsets.button12 = PRVM_ED_FindFieldOffset("button12"); - prog->fieldoffsets.button13 = PRVM_ED_FindFieldOffset("button13"); - prog->fieldoffsets.button14 = PRVM_ED_FindFieldOffset("button14"); - prog->fieldoffsets.button15 = PRVM_ED_FindFieldOffset("button15"); - prog->fieldoffsets.button16 = PRVM_ED_FindFieldOffset("button16"); - prog->fieldoffsets.buttonchat = PRVM_ED_FindFieldOffset("buttonchat"); - prog->fieldoffsets.buttonuse = PRVM_ED_FindFieldOffset("buttonuse"); - prog->fieldoffsets.chain = PRVM_ED_FindFieldOffset("chain"); - prog->fieldoffsets.classname = PRVM_ED_FindFieldOffset("classname"); - prog->fieldoffsets.clientcolors = PRVM_ED_FindFieldOffset("clientcolors"); - prog->fieldoffsets.color = PRVM_ED_FindFieldOffset("color"); - prog->fieldoffsets.colormod = PRVM_ED_FindFieldOffset("colormod"); - prog->fieldoffsets.contentstransition = PRVM_ED_FindFieldOffset("contentstransition"); - prog->fieldoffsets.cursor_active = PRVM_ED_FindFieldOffset("cursor_active"); - prog->fieldoffsets.cursor_screen = PRVM_ED_FindFieldOffset("cursor_screen"); - prog->fieldoffsets.cursor_trace_endpos = PRVM_ED_FindFieldOffset("cursor_trace_endpos"); - prog->fieldoffsets.cursor_trace_ent = PRVM_ED_FindFieldOffset("cursor_trace_ent"); - prog->fieldoffsets.cursor_trace_start = PRVM_ED_FindFieldOffset("cursor_trace_start"); - prog->fieldoffsets.customizeentityforclient = PRVM_ED_FindFieldOffset("customizeentityforclient"); - prog->fieldoffsets.dimension_hit = PRVM_ED_FindFieldOffset("dimension_hit"); - prog->fieldoffsets.dimension_solid = PRVM_ED_FindFieldOffset("dimension_solid"); - prog->fieldoffsets.disableclientprediction = PRVM_ED_FindFieldOffset("disableclientprediction"); - prog->fieldoffsets.dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask"); - prog->fieldoffsets.drawonlytoclient = PRVM_ED_FindFieldOffset("drawonlytoclient"); - prog->fieldoffsets.exteriormodeltoclient = PRVM_ED_FindFieldOffset("exteriormodeltoclient"); - prog->fieldoffsets.fatness = PRVM_ED_FindFieldOffset("fatness"); - prog->fieldoffsets.forceshader = PRVM_ED_FindFieldOffset("forceshader"); - prog->fieldoffsets.frame = PRVM_ED_FindFieldOffset("frame"); - prog->fieldoffsets.frame1time = PRVM_ED_FindFieldOffset("frame1time"); - prog->fieldoffsets.frame2 = PRVM_ED_FindFieldOffset("frame2"); - prog->fieldoffsets.frame2time = PRVM_ED_FindFieldOffset("frame2time"); - prog->fieldoffsets.fullbright = PRVM_ED_FindFieldOffset("fullbright"); - prog->fieldoffsets.glow_color = PRVM_ED_FindFieldOffset("glow_color"); - prog->fieldoffsets.glow_size = PRVM_ED_FindFieldOffset("glow_size"); - prog->fieldoffsets.glow_trail = PRVM_ED_FindFieldOffset("glow_trail"); - prog->fieldoffsets.gravity = PRVM_ED_FindFieldOffset("gravity"); - prog->fieldoffsets.groundentity = PRVM_ED_FindFieldOffset("groundentity"); - prog->fieldoffsets.hull = PRVM_ED_FindFieldOffset("hull"); - prog->fieldoffsets.ideal_yaw = PRVM_ED_FindFieldOffset("ideal_yaw"); - prog->fieldoffsets.idealpitch = PRVM_ED_FindFieldOffset("idealpitch"); - prog->fieldoffsets.items2 = PRVM_ED_FindFieldOffset("items2"); - prog->fieldoffsets.lerpfrac = PRVM_ED_FindFieldOffset("lerpfrac"); - prog->fieldoffsets.light_lev = PRVM_ED_FindFieldOffset("light_lev"); - prog->fieldoffsets.message = PRVM_ED_FindFieldOffset("message"); - prog->fieldoffsets.modelflags = PRVM_ED_FindFieldOffset("modelflags"); - prog->fieldoffsets.movement = PRVM_ED_FindFieldOffset("movement"); - prog->fieldoffsets.movetypesteplandevent = PRVM_ED_FindFieldOffset("movetypesteplandevent"); - prog->fieldoffsets.netaddress = PRVM_ED_FindFieldOffset("netaddress"); - prog->fieldoffsets.nextthink = PRVM_ED_FindFieldOffset("nextthink"); - prog->fieldoffsets.nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient"); - prog->fieldoffsets.pflags = PRVM_ED_FindFieldOffset("pflags"); - prog->fieldoffsets.ping = PRVM_ED_FindFieldOffset("ping"); - prog->fieldoffsets.pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed"); - prog->fieldoffsets.playermodel = PRVM_ED_FindFieldOffset("playermodel"); - prog->fieldoffsets.playerskin = PRVM_ED_FindFieldOffset("playerskin"); - prog->fieldoffsets.pmodel = PRVM_ED_FindFieldOffset("pmodel"); - prog->fieldoffsets.punchvector = PRVM_ED_FindFieldOffset("punchvector"); - prog->fieldoffsets.renderamt = PRVM_ED_FindFieldOffset("renderamt"); // HalfLife support - prog->fieldoffsets.renderflags = PRVM_ED_FindFieldOffset("renderflags"); - prog->fieldoffsets.rendermode = PRVM_ED_FindFieldOffset("rendermode"); // HalfLife support - prog->fieldoffsets.scale = PRVM_ED_FindFieldOffset("scale"); - prog->fieldoffsets.style = PRVM_ED_FindFieldOffset("style"); - prog->fieldoffsets.tag_entity = PRVM_ED_FindFieldOffset("tag_entity"); - prog->fieldoffsets.tag_index = PRVM_ED_FindFieldOffset("tag_index"); - prog->fieldoffsets.think = PRVM_ED_FindFieldOffset("think"); - prog->fieldoffsets.viewmodelforclient = PRVM_ED_FindFieldOffset("viewmodelforclient"); - prog->fieldoffsets.viewzoom = PRVM_ED_FindFieldOffset("viewzoom"); - prog->fieldoffsets.yaw_speed = PRVM_ED_FindFieldOffset("yaw_speed"); - prog->fieldoffsets.clientcamera = PRVM_ED_FindFieldOffset("clientcamera"); - prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand"); - prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove"); - prog->funcoffsets.CSQC_Ent_Update = PRVM_ED_FindFunctionOffset("CSQC_Ent_Update"); - prog->funcoffsets.CSQC_Ent_Spawn = PRVM_ED_FindFunctionOffset("CSQC_Ent_Spawn"); - prog->funcoffsets.CSQC_Event = PRVM_ED_FindFunctionOffset("CSQC_Event"); - prog->funcoffsets.CSQC_Event_Sound = PRVM_ED_FindFunctionOffset("CSQC_Event_Sound"); - prog->funcoffsets.CSQC_Init = PRVM_ED_FindFunctionOffset("CSQC_Init"); - prog->funcoffsets.CSQC_InputEvent = PRVM_ED_FindFunctionOffset("CSQC_InputEvent"); - prog->funcoffsets.CSQC_Parse_CenterPrint = PRVM_ED_FindFunctionOffset("CSQC_Parse_CenterPrint"); - prog->funcoffsets.CSQC_Parse_Print = PRVM_ED_FindFunctionOffset("CSQC_Parse_Print"); - prog->funcoffsets.CSQC_Parse_StuffCmd = PRVM_ED_FindFunctionOffset("CSQC_Parse_StuffCmd"); - prog->funcoffsets.CSQC_Parse_TempEntity = PRVM_ED_FindFunctionOffset("CSQC_Parse_TempEntity"); - prog->funcoffsets.CSQC_Shutdown = PRVM_ED_FindFunctionOffset("CSQC_Shutdown"); - prog->funcoffsets.CSQC_UpdateView = PRVM_ED_FindFunctionOffset("CSQC_UpdateView"); - prog->funcoffsets.Gecko_Query = PRVM_ED_FindFunctionOffset("Gecko_Query"); - prog->funcoffsets.EndFrame = PRVM_ED_FindFunctionOffset("EndFrame"); - prog->funcoffsets.RestoreGame = PRVM_ED_FindFunctionOffset("RestoreGame"); - prog->funcoffsets.SV_ChangeTeam = PRVM_ED_FindFunctionOffset("SV_ChangeTeam"); - prog->funcoffsets.SV_ParseClientCommand = PRVM_ED_FindFunctionOffset("SV_ParseClientCommand"); - prog->funcoffsets.SV_PlayerPhysics = PRVM_ED_FindFunctionOffset("SV_PlayerPhysics"); - prog->funcoffsets.SV_OnEntityNoSpawnFunction = PRVM_ED_FindFunctionOffset("SV_OnEntityNoSpawnFunction"); - prog->funcoffsets.GameCommand = PRVM_ED_FindFunctionOffset("GameCommand"); - prog->funcoffsets.SV_Shutdown = PRVM_ED_FindFunctionOffset("SV_Shutdown"); - prog->globaloffsets.SV_InitCmd = PRVM_ED_FindGlobalOffset("SV_InitCmd"); - prog->globaloffsets.self = PRVM_ED_FindGlobalOffset("self"); - prog->globaloffsets.time = PRVM_ED_FindGlobalOffset("time"); - prog->globaloffsets.v_forward = PRVM_ED_FindGlobalOffset("v_forward"); - prog->globaloffsets.v_right = PRVM_ED_FindGlobalOffset("v_right"); - prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up"); - prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles"); - prog->globaloffsets.trace_allsolid = PRVM_ED_FindGlobalOffset("trace_allsolid"); - prog->globaloffsets.trace_startsolid = PRVM_ED_FindGlobalOffset("trace_startsolid"); - prog->globaloffsets.trace_fraction = PRVM_ED_FindGlobalOffset("trace_fraction"); - prog->globaloffsets.trace_inwater = PRVM_ED_FindGlobalOffset("trace_inwater"); - prog->globaloffsets.trace_inopen = PRVM_ED_FindGlobalOffset("trace_inopen"); - prog->globaloffsets.trace_endpos = PRVM_ED_FindGlobalOffset("trace_endpos"); - prog->globaloffsets.trace_plane_normal = PRVM_ED_FindGlobalOffset("trace_plane_normal"); - prog->globaloffsets.trace_plane_dist = PRVM_ED_FindGlobalOffset("trace_plane_dist"); - prog->globaloffsets.trace_ent = PRVM_ED_FindGlobalOffset("trace_ent"); - prog->globaloffsets.trace_dphitcontents = PRVM_ED_FindGlobalOffset("trace_dphitcontents"); - prog->globaloffsets.trace_dphitq3surfaceflags = PRVM_ED_FindGlobalOffset("trace_dphitq3surfaceflags"); - prog->globaloffsets.trace_dphittexturename = PRVM_ED_FindGlobalOffset("trace_dphittexturename"); - prog->globaloffsets.trace_dpstartcontents = PRVM_ED_FindGlobalOffset("trace_dpstartcontents"); - prog->globaloffsets.intermission = PRVM_ED_FindGlobalOffset("intermission"); - prog->globaloffsets.coop = PRVM_ED_FindGlobalOffset("coop"); - prog->globaloffsets.deathmatch = PRVM_ED_FindGlobalOffset("deathmatch"); - prog->globaloffsets.dmg_take = PRVM_ED_FindGlobalOffset("dmg_take"); - prog->globaloffsets.dmg_save = PRVM_ED_FindGlobalOffset("dmg_save"); - prog->globaloffsets.dmg_origin = PRVM_ED_FindGlobalOffset("dmg_origin"); - prog->globaloffsets.sb_showscores = PRVM_ED_FindGlobalOffset("sb_showscores"); - prog->globaloffsets.drawfont = PRVM_ED_FindGlobalOffset("drawfont"); - prog->globaloffsets.require_spawnfunc_prefix = PRVM_ED_FindGlobalOffset("require_spawnfunc_prefix"); - - // menu qc only uses some functions, nothing else - prog->funcoffsets.m_draw = PRVM_ED_FindFunctionOffset("m_draw"); - prog->funcoffsets.m_init = PRVM_ED_FindFunctionOffset("m_init"); - prog->funcoffsets.m_keydown = PRVM_ED_FindFunctionOffset("m_keydown"); - prog->funcoffsets.m_keyup = PRVM_ED_FindFunctionOffset("m_keyup"); - prog->funcoffsets.m_shutdown = PRVM_ED_FindFunctionOffset("m_shutdown"); - prog->funcoffsets.m_toggle = PRVM_ED_FindFunctionOffset("m_toggle"); +#define PRVM_DECLARE_serverglobalfloat(x) +#define PRVM_DECLARE_serverglobalvector(x) +#define PRVM_DECLARE_serverglobalstring(x) +#define PRVM_DECLARE_serverglobaledict(x) +#define PRVM_DECLARE_serverglobalfunction(x) +#define PRVM_DECLARE_clientglobalfloat(x) +#define PRVM_DECLARE_clientglobalvector(x) +#define PRVM_DECLARE_clientglobalstring(x) +#define PRVM_DECLARE_clientglobaledict(x) +#define PRVM_DECLARE_clientglobalfunction(x) +#define PRVM_DECLARE_menuglobalfloat(x) +#define PRVM_DECLARE_menuglobalvector(x) +#define PRVM_DECLARE_menuglobalstring(x) +#define PRVM_DECLARE_menuglobaledict(x) +#define PRVM_DECLARE_menuglobalfunction(x) +#define PRVM_DECLARE_serverfieldfloat(x) +#define PRVM_DECLARE_serverfieldvector(x) +#define PRVM_DECLARE_serverfieldstring(x) +#define PRVM_DECLARE_serverfieldedict(x) +#define PRVM_DECLARE_serverfieldfunction(x) +#define PRVM_DECLARE_clientfieldfloat(x) +#define PRVM_DECLARE_clientfieldvector(x) +#define PRVM_DECLARE_clientfieldstring(x) +#define PRVM_DECLARE_clientfieldedict(x) +#define PRVM_DECLARE_clientfieldfunction(x) +#define PRVM_DECLARE_menufieldfloat(x) +#define PRVM_DECLARE_menufieldvector(x) +#define PRVM_DECLARE_menufieldstring(x) +#define PRVM_DECLARE_menufieldedict(x) +#define PRVM_DECLARE_menufieldfunction(x) +#define PRVM_DECLARE_serverfunction(x) +#define PRVM_DECLARE_clientfunction(x) +#define PRVM_DECLARE_menufunction(x) +#define PRVM_DECLARE_field(x) prog->fieldoffsets.x = PRVM_ED_FindFieldOffset(#x); +#define PRVM_DECLARE_global(x) prog->globaloffsets.x = PRVM_ED_FindGlobalOffset(#x); +#define PRVM_DECLARE_function(x) prog->funcoffsets.x = PRVM_ED_FindFunctionOffset(#x); +#include "prvm_offsets.h" +#undef PRVM_DECLARE_serverglobalfloat +#undef PRVM_DECLARE_serverglobalvector +#undef PRVM_DECLARE_serverglobalstring +#undef PRVM_DECLARE_serverglobaledict +#undef PRVM_DECLARE_serverglobalfunction +#undef PRVM_DECLARE_clientglobalfloat +#undef PRVM_DECLARE_clientglobalvector +#undef PRVM_DECLARE_clientglobalstring +#undef PRVM_DECLARE_clientglobaledict +#undef PRVM_DECLARE_clientglobalfunction +#undef PRVM_DECLARE_menuglobalfloat +#undef PRVM_DECLARE_menuglobalvector +#undef PRVM_DECLARE_menuglobalstring +#undef PRVM_DECLARE_menuglobaledict +#undef PRVM_DECLARE_menuglobalfunction +#undef PRVM_DECLARE_serverfieldfloat +#undef PRVM_DECLARE_serverfieldvector +#undef PRVM_DECLARE_serverfieldstring +#undef PRVM_DECLARE_serverfieldedict +#undef PRVM_DECLARE_serverfieldfunction +#undef PRVM_DECLARE_clientfieldfloat +#undef PRVM_DECLARE_clientfieldvector +#undef PRVM_DECLARE_clientfieldstring +#undef PRVM_DECLARE_clientfieldedict +#undef PRVM_DECLARE_clientfieldfunction +#undef PRVM_DECLARE_menufieldfloat +#undef PRVM_DECLARE_menufieldvector +#undef PRVM_DECLARE_menufieldstring +#undef PRVM_DECLARE_menufieldedict +#undef PRVM_DECLARE_menufieldfunction +#undef PRVM_DECLARE_serverfunction +#undef PRVM_DECLARE_clientfunction +#undef PRVM_DECLARE_menufunction +#undef PRVM_DECLARE_field +#undef PRVM_DECLARE_global +#undef PRVM_DECLARE_function } // not used @@ -1541,12 +1628,255 @@ PRVM_ResetProg =============== */ -void PRVM_LeakTest(); -void PRVM_ResetProg() +#define PO_HASHSIZE 16384 +typedef struct po_string_s +{ + char *key, *value; + struct po_string_s *nextonhashchain; +} +po_string_t; +typedef struct po_s +{ + po_string_t *hashtable[PO_HASHSIZE]; +} +po_t; +void PRVM_PO_UnparseString(char *out, const char *in, size_t outsize) +{ + for(;;) + { + switch(*in) + { + case 0: + *out++ = 0; + return; + case '\a': if(outsize >= 2) { *out++ = '\\'; *out++ = 'a'; outsize -= 2; } break; + case '\b': if(outsize >= 2) { *out++ = '\\'; *out++ = 'b'; outsize -= 2; } break; + case '\t': if(outsize >= 2) { *out++ = '\\'; *out++ = 't'; outsize -= 2; } break; + case '\r': if(outsize >= 2) { *out++ = '\\'; *out++ = 'r'; outsize -= 2; } break; + case '\n': if(outsize >= 2) { *out++ = '\\'; *out++ = 'n'; outsize -= 2; } break; + case '\\': if(outsize >= 2) { *out++ = '\\'; *out++ = '\\'; outsize -= 2; } break; + case '"': if(outsize >= 2) { *out++ = '\\'; *out++ = '"'; outsize -= 2; } break; + default: + if(*in >= 0 && *in <= 0x1F) + { + if(outsize >= 4) + { + *out++ = '\\'; + *out++ = '0' + ((*in & 0700) >> 6); + *out++ = '0' + ((*in & 0070) >> 3); + *out++ = '0' + ((*in & 0007)); + outsize -= 4; + } + } + else + { + if(outsize >= 1) + { + *out++ = *in; + outsize -= 1; + } + } + break; + } + ++in; + } +} +void PRVM_PO_ParseString(char *out, const char *in, size_t outsize) +{ + for(;;) + { + switch(*in) + { + case 0: + *out++ = 0; + return; + case '\\': + ++in; + switch(*in) + { + case 'a': if(outsize > 0) { *out++ = '\a'; --outsize; } break; + case 'b': if(outsize > 0) { *out++ = '\b'; --outsize; } break; + case 't': if(outsize > 0) { *out++ = '\t'; --outsize; } break; + case 'r': if(outsize > 0) { *out++ = '\r'; --outsize; } break; + case 'n': if(outsize > 0) { *out++ = '\n'; --outsize; } break; + 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) + *out = *in - '0'; + ++in; + if(*in >= '0' && *in <= '7') + { + if(outsize > 0) + *out = (*out << 3) | (*in - '0'); + ++in; + } + if(*in >= '0' && *in <= '7') + { + if(outsize > 0) + *out = (*out << 3) | (*in - '0'); + ++in; + } + --in; + if(outsize > 0) + { + ++out; + --outsize; + } + break; + default: + if(outsize > 0) { *out++ = *in; --outsize; } + break; + } + break; + default: + if(outsize > 0) + { + *out++ = *in; + --outsize; + } + break; + } + ++in; + } +} +po_t *PRVM_PO_Load(const char *filename, mempool_t *pool) +{ + po_t *po; + const char *p, *q; + int mode; + char inbuf[MAX_INPUTLINE]; + char decodedbuf[MAX_INPUTLINE]; + size_t decodedpos; + int hashindex; + po_string_t thisstr; + const char *buf = (const char *) FS_LoadFile(filename, pool, true, NULL); + + if(!buf) + return NULL; + + memset(&thisstr, 0, sizeof(thisstr)); // hush compiler warning + + po = (po_t *)Mem_Alloc(pool, sizeof(*po)); + memset(po, 0, sizeof(*po)); + + p = buf; + while(*p) + { + if(*p == '#') + { + // skip to newline + p = strchr(p, '\n'); + if(!p) + break; + ++p; + continue; + } + if(*p == '\r' || *p == '\n') + { + ++p; + continue; + } + if(!strncmp(p, "msgid \"", 7)) + { + mode = 0; + p += 6; + } + else if(!strncmp(p, "msgstr \"", 8)) + { + mode = 1; + p += 7; + } + else + { + p = strchr(p, '\n'); + if(!p) + break; + ++p; + continue; + } + decodedpos = 0; + while(*p == '"') + { + ++p; + q = strchr(p, '\n'); + if(!q) + break; + if(*(q-1) == '\r') + --q; + if(*(q-1) != '"') + break; + if((size_t)(q - p) >= (size_t) sizeof(inbuf)) + break; + strlcpy(inbuf, p, q - p); // not - 1, because this adds a NUL + PRVM_PO_ParseString(decodedbuf + decodedpos, inbuf, sizeof(decodedbuf) - decodedpos); + decodedpos += strlen(decodedbuf + decodedpos); + if(*q == '\r') + ++q; + if(*q == '\n') + ++q; + p = q; + } + if(mode == 0) + { + if(thisstr.key) + Mem_Free(thisstr.key); + thisstr.key = (char *)Mem_Alloc(pool, decodedpos + 1); + memcpy(thisstr.key, decodedbuf, decodedpos + 1); + } + else if(decodedpos > 0 && thisstr.key) // skip empty translation results + { + thisstr.value = (char *)Mem_Alloc(pool, decodedpos + 1); + memcpy(thisstr.value, decodedbuf, decodedpos + 1); + hashindex = CRC_Block((const unsigned char *) thisstr.key, strlen(thisstr.key)) % PO_HASHSIZE; + thisstr.nextonhashchain = po->hashtable[hashindex]; + po->hashtable[hashindex] = (po_string_t *)Mem_Alloc(pool, sizeof(thisstr)); + memcpy(po->hashtable[hashindex], &thisstr, sizeof(thisstr)); + memset(&thisstr, 0, sizeof(thisstr)); + } + } + + Mem_Free((char *) buf); + return po; +} +const char *PRVM_PO_Lookup(po_t *po, const char *str) +{ + int hashindex = CRC_Block((const unsigned char *) str, strlen(str)) % PO_HASHSIZE; + po_string_t *p = po->hashtable[hashindex]; + while(p) + { + if(!strcmp(str, p->key)) + return p->value; + p = p->nextonhashchain; + } + return NULL; +} +void PRVM_PO_Destroy(po_t *po) +{ + int i; + for(i = 0; i < PO_HASHSIZE; ++i) + { + po_string_t *p = po->hashtable[i]; + while(p) + { + po_string_t *q = p; + p = p->nextonhashchain; + Mem_Free(q->key); + Mem_Free(q->value); + Mem_Free(q); + } + } + Mem_Free(po); +} + +void PRVM_LeakTest(void); +void PRVM_ResetProg(void) { PRVM_LeakTest(); PRVM_GCALL(reset_cmd)(); Mem_FreePool(&prog->progs_mempool); + if(prog->po) + PRVM_PO_Destroy((po_t *) prog->po); memset(prog,0,sizeof(prvm_prog_t)); prog->starttime = Sys_DoubleTime(); } @@ -1579,7 +1909,8 @@ void PRVM_LoadLNO( const char *progname ) { SafeWrite (h, &numstatements, sizeof(int)); SafeWrite (h, statement_linenums, numstatements*sizeof(int)); */ - if( (unsigned) filesize < (6 + prog->progs->numstatements) * sizeof( int ) ) { + if ((unsigned int)filesize < (6 + prog->progs_numstatements) * sizeof(int)) + { Mem_Free(lno); return; } @@ -1587,13 +1918,13 @@ void PRVM_LoadLNO( const char *progname ) { header = (unsigned int *) lno; if( header[ 0 ] == *(unsigned int *) "LNOF" && LittleLong( header[ 1 ] ) == 1 && - (unsigned int)LittleLong( header[ 2 ] ) == (unsigned int)prog->progs->numglobaldefs && - (unsigned int)LittleLong( header[ 3 ] ) == (unsigned int)prog->progs->numglobals && - (unsigned int)LittleLong( header[ 4 ] ) == (unsigned int)prog->progs->numfielddefs && - (unsigned int)LittleLong( header[ 5 ] ) == (unsigned int)prog->progs->numstatements ) + (unsigned int)LittleLong( header[ 2 ] ) == (unsigned int)prog->progs_numglobaldefs && + (unsigned int)LittleLong( header[ 3 ] ) == (unsigned int)prog->progs_numglobals && + (unsigned int)LittleLong( header[ 4 ] ) == (unsigned int)prog->progs_numfielddefs && + (unsigned int)LittleLong( header[ 5 ] ) == (unsigned int)prog->progs_numstatements ) { - prog->statement_linenums = (int *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof( int ) ); - memcpy( prog->statement_linenums, (int *) lno + 6, prog->progs->numstatements * sizeof( int ) ); + prog->statement_linenums = (int *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof( int ) ); + memcpy( prog->statement_linenums, (int *) lno + 6, prog->progs_numstatements * sizeof( int ) ); } Mem_Free( lno ); } @@ -1603,42 +1934,73 @@ void PRVM_LoadLNO( const char *progname ) { PRVM_LoadProgs =============== */ -void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global) +void PRVM_LoadProgs (const char * filename, int numrequiredfunc, const char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, prvm_required_field_t *required_global) { int i; - dstatement_t *st; + dprograms_t *dprograms; + dstatement_t *instatements; ddef_t *infielddefs; - dfunction_t *dfunctions; + ddef_t *inglobaldefs; + float *inglobals; + dfunction_t *infunctions; + char *instrings; fs_offset_t filesize; + int requiredglobalspace; + opcode_t op; + int a; + int b; + int c; - if( prog->loaded ) { + if (prog->loaded) PRVM_ERROR ("PRVM_LoadProgs: there is already a %s program loaded!", PRVM_NAME ); - } - prog->progs = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false, &filesize); - if (prog->progs == NULL || filesize < (fs_offset_t)sizeof(dprograms_t)) + dprograms = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false, &filesize); + if (dprograms == NULL || filesize < (fs_offset_t)sizeof(dprograms_t)) PRVM_ERROR ("PRVM_LoadProgs: couldn't load %s for %s", filename, PRVM_NAME); + // TODO bounds check header fields (e.g. numstatements), they must never go behind end of file Con_DPrintf("%s programs occupy %iK.\n", PRVM_NAME, (int)(filesize/1024)); - prog->filecrc = CRC_Block((unsigned char *)prog->progs, filesize); + requiredglobalspace = 0; + for (i = 0;i < numrequiredglobals;i++) + requiredglobalspace += required_global[i].type == ev_vector ? 3 : 1; -// byte swap the header - for (i = 0;i < (int) sizeof(*prog->progs) / 4;i++) - ((int *)prog->progs)[i] = LittleLong ( ((int *)prog->progs)[i] ); + prog->filecrc = CRC_Block((unsigned char *)dprograms, filesize); - if (prog->progs->version != PROG_VERSION) - PRVM_ERROR ("%s: %s has wrong version number (%i should be %i)", PRVM_NAME, filename, prog->progs->version, PROG_VERSION); - if (prog->progs->crc != prog->headercrc && prog->progs->crc != prog->headercrc2) - PRVM_ERROR ("%s: %s system vars have been modified (CRC of progs.dat systemvars %i != engine %i), progdefs.h is out of date", PRVM_NAME, filename, prog->progs->crc, prog->headercrc); - - //prog->functions = (dfunction_t *)((unsigned char *)progs + progs->ofs_functions); - dfunctions = (dfunction_t *)((unsigned char *)prog->progs + prog->progs->ofs_functions); - - if (prog->progs->ofs_strings + prog->progs->numstrings >= (int)filesize) +// byte swap the header + prog->progs_version = LittleLong(dprograms->version); + prog->progs_crc = LittleLong(dprograms->crc); + if (prog->progs_version != PROG_VERSION) + PRVM_ERROR ("%s: %s has wrong version number (%i should be %i)", PRVM_NAME, filename, prog->progs_version, PROG_VERSION); + if (prog->progs_crc != prog->headercrc && prog->progs_crc != prog->headercrc2) + PRVM_ERROR ("%s: %s system vars have been modified (CRC of progs.dat systemvars %i != engine %i), progdefs.h is out of date", PRVM_NAME, filename, prog->progs_crc, prog->headercrc); + instatements = (dstatement_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_statements)); + prog->progs_numstatements = LittleLong(dprograms->numstatements); + inglobaldefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globaldefs)); + prog->progs_numglobaldefs = LittleLong(dprograms->numglobaldefs); + infielddefs = (ddef_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_fielddefs)); + prog->progs_numfielddefs = LittleLong(dprograms->numfielddefs); + infunctions = (dfunction_t *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_functions)); + prog->progs_numfunctions = LittleLong(dprograms->numfunctions); + instrings = (char *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_strings)); + prog->progs_numstrings = LittleLong(dprograms->numstrings); + inglobals = (float *)((unsigned char *)dprograms + LittleLong(dprograms->ofs_globals)); + prog->progs_numglobals = LittleLong(dprograms->numglobals); + prog->progs_entityfields = LittleLong(dprograms->entityfields); + + prog->numstatements = prog->progs_numstatements; + prog->numglobaldefs = prog->progs_numglobaldefs; + prog->numfielddefs = prog->progs_numfielddefs; + prog->numfunctions = prog->progs_numfunctions; + prog->numstrings = prog->progs_numstrings; + prog->numglobals = prog->progs_numglobals; + prog->entityfields = prog->progs_entityfields; + + if (LittleLong(dprograms->ofs_strings) + prog->progs_numstrings >= (int)filesize) PRVM_ERROR ("%s: %s strings go past end of file", PRVM_NAME, filename); - prog->strings = (char *)prog->progs + prog->progs->ofs_strings; - prog->stringssize = prog->progs->numstrings; + prog->strings = (char *)Mem_Alloc(prog->progs_mempool, prog->progs_numstrings); + memcpy(prog->strings, instrings, prog->progs_numstrings); + prog->stringssize = prog->progs_numstrings; prog->numknownstrings = 0; prog->maxknownstrings = 0; @@ -1647,106 +2009,119 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required Mem_ExpandableArray_NewArray(&prog->stringbuffersarray, prog->progs_mempool, sizeof(prvm_stringbuffer_t), 64); - prog->globaldefs = (ddef_t *)((unsigned char *)prog->progs + prog->progs->ofs_globaldefs); - - // we need to expand the fielddefs list to include all the engine fields, - // so allocate a new place for it - infielddefs = (ddef_t *)((unsigned char *)prog->progs + prog->progs->ofs_fielddefs); - // ( + DPFIELDS ) - prog->fielddefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs->numfielddefs + numrequiredfields) * sizeof(ddef_t)); - - prog->statements = (dstatement_t *)((unsigned char *)prog->progs + prog->progs->ofs_statements); - - prog->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs->numstatements * sizeof(*prog->statement_profile)); - - // moved edict_size calculation down below field adding code - - //pr_global_struct = (globalvars_t *)((unsigned char *)progs + progs->ofs_globals); - prog->globals.generic = (float *)((unsigned char *)prog->progs + prog->progs->ofs_globals); - -// byte swap the lumps - for (i=0 ; iprogs->numstatements ; i++) - { - prog->statements[i].op = LittleShort(prog->statements[i].op); - prog->statements[i].a = LittleShort(prog->statements[i].a); - prog->statements[i].b = LittleShort(prog->statements[i].b); - prog->statements[i].c = LittleShort(prog->statements[i].c); - } - - prog->functions = (mfunction_t *)Mem_Alloc(prog->progs_mempool, sizeof(mfunction_t) * prog->progs->numfunctions); - for (i = 0;i < prog->progs->numfunctions;i++) - { - prog->functions[i].first_statement = LittleLong (dfunctions[i].first_statement); - prog->functions[i].parm_start = LittleLong (dfunctions[i].parm_start); - prog->functions[i].s_name = LittleLong (dfunctions[i].s_name); - prog->functions[i].s_file = LittleLong (dfunctions[i].s_file); - prog->functions[i].numparms = LittleLong (dfunctions[i].numparms); - prog->functions[i].locals = LittleLong (dfunctions[i].locals); - memcpy(prog->functions[i].parm_size, dfunctions[i].parm_size, sizeof(dfunctions[i].parm_size)); - } - - for (i=0 ; iprogs->numglobaldefs ; i++) - { - prog->globaldefs[i].type = LittleShort (prog->globaldefs[i].type); - prog->globaldefs[i].ofs = LittleShort (prog->globaldefs[i].ofs); - prog->globaldefs[i].s_name = LittleLong (prog->globaldefs[i].s_name); + // 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->globals.generic = (float *)Mem_Alloc(prog->progs_mempool, (prog->progs_numglobals + requiredglobalspace) * sizeof(float)); + prog->fielddefs = (ddef_t *)Mem_Alloc(prog->progs_mempool, (prog->progs_numfielddefs + numrequiredfields) * sizeof(ddef_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 + prog->statement_profile = (double *)Mem_Alloc(prog->progs_mempool, prog->progs_numstatements * sizeof(*prog->statement_profile)); + // functions need to be converted to the memory format + prog->functions = (mfunction_t *)Mem_Alloc(prog->progs_mempool, sizeof(mfunction_t) * prog->progs_numfunctions); + + for (i = 0;i < prog->progs_numfunctions;i++) + { + prog->functions[i].first_statement = LittleLong(infunctions[i].first_statement); + prog->functions[i].parm_start = LittleLong(infunctions[i].parm_start); + prog->functions[i].s_name = LittleLong(infunctions[i].s_name); + prog->functions[i].s_file = LittleLong(infunctions[i].s_file); + prog->functions[i].numparms = LittleLong(infunctions[i].numparms); + prog->functions[i].locals = LittleLong(infunctions[i].locals); + memcpy(prog->functions[i].parm_size, infunctions[i].parm_size, sizeof(infunctions[i].parm_size)); + if(prog->functions[i].first_statement >= prog->numstatements) + PRVM_ERROR("PRVM_LoadProgs: out of bounds function statement (function %d) in %s", i, PRVM_NAME); + // TODO bounds check parm_start, s_name, s_file, numparms, locals, parm_size + } + + // copy the globaldefs to the new globaldefs list + for (i=0 ; inumglobaldefs ; i++) + { + 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 + } + + // append the required globals + for (i = 0;i < numrequiredglobals;i++) + { + prog->globaldefs[prog->numglobaldefs].type = required_global[i].type; + prog->globaldefs[prog->numglobaldefs].ofs = prog->numglobals; + prog->globaldefs[prog->numglobaldefs].s_name = PRVM_SetEngineString(required_global[i].name); + if (prog->globaldefs[prog->numglobaldefs].type == ev_vector) + prog->numglobals += 3; + else + prog->numglobals++; + prog->numglobaldefs++; } // copy the progs fields to the new fields list - for (i = 0;i < prog->progs->numfielddefs;i++) + for (i = 0;i < prog->numfielddefs;i++) { - prog->fielddefs[i].type = LittleShort (infielddefs[i].type); + prog->fielddefs[i].type = LittleShort(infielddefs[i].type); if (prog->fielddefs[i].type & DEF_SAVEGLOBAL) PRVM_ERROR ("PRVM_LoadProgs: prog->fielddefs[i].type & DEF_SAVEGLOBAL in %s", PRVM_NAME); - prog->fielddefs[i].ofs = LittleShort (infielddefs[i].ofs); - prog->fielddefs[i].s_name = LittleLong (infielddefs[i].s_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 } // append the required fields - for (i = 0;i < (int) numrequiredfields;i++) + for (i = 0;i < numrequiredfields;i++) { - prog->fielddefs[prog->progs->numfielddefs].type = required_field[i].type; - prog->fielddefs[prog->progs->numfielddefs].ofs = prog->progs->entityfields; - prog->fielddefs[prog->progs->numfielddefs].s_name = PRVM_SetEngineString(required_field[i].name); - if (prog->fielddefs[prog->progs->numfielddefs].type == ev_vector) - prog->progs->entityfields += 3; + prog->fielddefs[prog->numfielddefs].type = required_field[i].type; + prog->fielddefs[prog->numfielddefs].ofs = prog->entityfields; + prog->fielddefs[prog->numfielddefs].s_name = PRVM_SetEngineString(required_field[i].name); + if (prog->fielddefs[prog->numfielddefs].type == ev_vector) + prog->entityfields += 3; else - prog->progs->entityfields++; - prog->progs->numfielddefs++; + prog->entityfields++; + prog->numfielddefs++; } - // check required functions - for(i=0 ; i < numrequiredfunc ; i++) - if(PRVM_ED_FindFunction(required_func[i]) == 0) - PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_func[i], filename); + // LordHavoc: TODO: reorder globals to match engine struct + // LordHavoc: TODO: reorder fields to match engine struct +#define remapglobal(index) (index) +#define remapfield(index) (index) - // check required globals - for(i=0 ; i < numrequiredglobals ; i++) - if(PRVM_ED_FindGlobal(required_global[i]) == 0) - PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_global[i], filename); + // copy globals + for (i = 0;i < prog->progs_numglobals;i++) + ((int *)prog->globals.generic)[remapglobal(i)] = LittleLong(((int *)inglobals)[i]); - for (i=0 ; iprogs->numglobals ; i++) - ((int *)prog->globals.generic)[i] = LittleLong (((int *)prog->globals.generic)[i]); - - // moved edict_size calculation down here, below field adding code - // LordHavoc: this no longer includes the prvm_edict_t header - prog->edict_size = prog->progs->entityfields * 4; - prog->edictareasize = prog->edict_size * prog->limit_edicts; - - // LordHavoc: bounds check anything static - for (i = 0,st = prog->statements;i < prog->progs->numstatements;i++,st++) + // LordHavoc: TODO: support 32bit progs statement formats + // copy, remap globals in statements, bounds check + for (i = 0;i < prog->progs_numstatements;i++) { - switch (st->op) + 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 (op) { case OP_IF: case OP_IFNOT: - if ((unsigned short) st->a >= prog->progs->numglobals || st->b + i < 0 || st->b + i >= prog->progs->numstatements) + b = (short)b; + if (a >= prog->progs_numglobals || b + i < 0 || b + i >= prog->progs_numstatements) PRVM_ERROR("PRVM_LoadProgs: out of bounds IF/IFNOT (statement %d) in %s", i, PRVM_NAME); + prog->statements[i].op = op; + prog->statements[i].operand[0] = remapglobal(a); + prog->statements[i].operand[1] = -1; + prog->statements[i].operand[2] = -1; + prog->statements[i].jumpabsolute = i + b; break; case OP_GOTO: - if (st->a + i < 0 || st->a + i >= prog->progs->numstatements) + a = (short)a; + if (a + i < 0 || a + i >= prog->progs_numstatements) PRVM_ERROR("PRVM_LoadProgs: out of bounds GOTO (statement %d) in %s", i, PRVM_NAME); + prog->statements[i].op = op; + prog->statements[i].operand[0] = -1; + prog->statements[i].operand[1] = -1; + prog->statements[i].operand[2] = -1; + prog->statements[i].jumpabsolute = i + a; break; + default: + Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", (int)op, i, PRVM_NAME); // global global global case OP_ADD_F: case OP_ADD_V: @@ -1782,8 +2157,13 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_LOAD_S: case OP_LOAD_FNC: case OP_LOAD_V: - if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->b >= prog->progs->numglobals || (unsigned short) st->c >= prog->progs->numglobals) + if (a >= prog->progs_numglobals || b >= prog->progs_numglobals || c >= prog->progs_numglobals) PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d)", i); + prog->statements[i].op = op; + prog->statements[i].operand[0] = remapglobal(a); + prog->statements[i].operand[1] = remapglobal(b); + prog->statements[i].operand[2] = remapglobal(c); + prog->statements[i].jumpabsolute = -1; break; // global none global case OP_NOT_F: @@ -1791,8 +2171,13 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_NOT_S: case OP_NOT_FNC: case OP_NOT_ENT: - if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->c >= prog->progs->numglobals) + if (a >= prog->progs_numglobals || c >= prog->progs_numglobals) PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); + prog->statements[i].op = op; + prog->statements[i].operand[0] = remapglobal(a); + prog->statements[i].operand[1] = -1; + prog->statements[i].operand[2] = remapglobal(c); + prog->statements[i].jumpabsolute = -1; break; // 2 globals case OP_STOREP_F: @@ -1808,8 +2193,13 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_STATE: case OP_STOREP_V: case OP_STORE_V: - if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->b >= prog->progs->numglobals) + if (a >= prog->progs_numglobals || b >= prog->progs_numglobals) PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); + prog->statements[i].op = op; + prog->statements[i].operand[0] = remapglobal(a); + prog->statements[i].operand[1] = remapglobal(b); + prog->statements[i].operand[2] = -1; + prog->statements[i].jumpabsolute = -1; break; // 1 global case OP_CALL0: @@ -1823,19 +2213,208 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_CALL8: case OP_DONE: case OP_RETURN: - if ((unsigned short) st->a >= prog->progs->numglobals) + if ( a >= prog->progs_numglobals) PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); + prog->statements[i].op = op; + prog->statements[i].operand[0] = remapglobal(a); + prog->statements[i].operand[1] = -1; + prog->statements[i].operand[2] = -1; + prog->statements[i].jumpabsolute = -1; + break; + } + } + if(prog->numstatements < 1) + { + PRVM_ERROR("PRVM_LoadProgs: empty program in %s", PRVM_NAME); + } + else switch(prog->statements[prog->numstatements - 1].op) + { + case OP_RETURN: + case OP_GOTO: + case OP_DONE: break; default: - Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", st->op, i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: program may fall off the edge (does not end with RETURN, GOTO or DONE) in %s", PRVM_NAME); break; - } } + // we're done with the file now + Mem_Free(dprograms); + dprograms = NULL; + + // check required functions + for(i=0 ; i < numrequiredfunc ; i++) + if(PRVM_ED_FindFunction(required_func[i]) == 0) + PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_func[i], filename); + PRVM_LoadLNO(filename); PRVM_Init_Exec(); + if(*prvm_language.string) + // 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 = !!strcmp(PRVM_NAME, "client"); + const char *realfilename = (strcmp(PRVM_NAME, "client") ? filename : csqc_progname.string); + if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method! + { + for (i=0 ; inumglobaldefs ; i++) + { + const char *name; + name = PRVM_GetString(prog->globaldefs[i].s_name); + if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) + if(name && !strncmp(name, "dotranslate_", 12)) + { + deftrans = false; + break; + } + } + } + if(!strcmp(prvm_language.string, "dump")) + { + qfile_t *f = FS_OpenRealFile(va("%s.pot", realfilename), "w", false); + Con_Printf("Dumping to %s.pot\n", realfilename); + if(f) + { + for (i=0 ; inumglobaldefs ; i++) + { + const char *name; + name = PRVM_GetString(prog->globaldefs[i].s_name); + if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12))) + if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) + { + prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs); + const char *value = PRVM_GetString(val->string); + if(*value) + { + char buf[MAX_INPUTLINE]; + PRVM_PO_UnparseString(buf, value, sizeof(buf)); + FS_Printf(f, "msgid \"%s\"\nmsgstr \"\"\n\n", buf); + } + } + } + FS_Close(f); + } + } + else + { + po_t *po = PRVM_PO_Load(va("%s.%s.po", realfilename, prvm_language.string), prog->progs_mempool); + if(po) + { + for (i=0 ; inumglobaldefs ; i++) + { + const char *name; + name = PRVM_GetString(prog->globaldefs[i].s_name); + if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12))) + if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) + { + prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs); + const char *value = PRVM_GetString(val->string); + if(*value) + { + value = PRVM_PO_Lookup(po, value); + if(value) + val->string = PRVM_SetEngineString(value); + } + } + } + } + } + } + + for (i=0 ; inumglobaldefs ; i++) + { + const char *name; + name = PRVM_GetString(prog->globaldefs[i].s_name); + //Con_Printf("found var %s\n", name); + if(name + && !strncmp(name, "autocvar_", 9) + && !(strlen(name) > 1 && name[strlen(name)-2] == '_' && (name[strlen(name)-1] == 'x' || name[strlen(name)-1] == 'y' || name[strlen(name)-1] == 'z')) + ) + { + prvm_eval_t *val = PRVM_GLOBALFIELDVALUE(prog->globaldefs[i].ofs); + cvar_t *cvar = Cvar_FindVar(name + 9); + //Con_Printf("PRVM_LoadProgs: autocvar global %s in %s, processing...\n", name, PRVM_NAME); + if(!cvar) + { + const char *value; + char buf[64]; + Con_DPrintf("PRVM_LoadProgs: no cvar for autocvar global %s in %s, creating...\n", name, PRVM_NAME); + switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) + { + case ev_float: + if((float)((int)(val->_float)) == val->_float) + dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float)); + else + dpsnprintf(buf, sizeof(buf), "%.9g", val->_float); + value = buf; + break; + case ev_vector: + dpsnprintf(buf, sizeof(buf), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); value = buf; + break; + case ev_string: + value = PRVM_GetString(val->string); + break; + default: + Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME); + goto fail; + } + cvar = Cvar_Get(name + 9, value, 0, NULL); + if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string) + { + val->string = PRVM_SetEngineString(cvar->string); + cvar->globaldefindex_stringno[prog - prog_list] = val->string; + } + if(!cvar) + PRVM_ERROR("PRVM_LoadProgs: could not create cvar for autocvar global %s in %s", name, PRVM_NAME); + cvar->globaldefindex_progid[prog - prog_list] = prog->id; + cvar->globaldefindex[prog - prog_list] = i; + } + else if((cvar->flags & CVAR_PRIVATE) == 0) + { + // MUST BE SYNCED WITH cvar.c Cvar_Set + int j; + const char *s; + switch(prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) + { + case ev_float: + val->_float = cvar->value; + break; + case ev_vector: + s = cvar->string; + VectorClear(val->vector); + for (j = 0;j < 3;j++) + { + while (*s && ISWHITESPACE(*s)) + s++; + if (!*s) + break; + val->vector[j] = atof(s); + while (!ISWHITESPACE(*s)) + s++; + if (!*s) + break; + } + break; + case ev_string: + val->string = PRVM_SetEngineString(cvar->string); + cvar->globaldefindex_stringno[prog - prog_list] = val->string; + break; + default: + Con_Printf("PRVM_LoadProgs: invalid type of autocvar global %s in %s\n", name, PRVM_NAME); + goto fail; + } + cvar->globaldefindex_progid[prog - prog_list] = prog->id; + cvar->globaldefindex[prog - prog_list] = i; + } + else + Con_Printf("PRVM_LoadProgs: private cvar for autocvar global %s in %s\n", name, PRVM_NAME); + } +fail: + ; + } + prog->loaded = TRUE; // set flags & ddef_ts in prog @@ -1880,19 +2459,19 @@ void PRVM_Fields_f (void) if(!PRVM_SetProgFromString(Cmd_Argv(1))) return; - counts = (int *)Mem_Alloc(tempmempool, prog->progs->numfielddefs * sizeof(int)); + counts = (int *)Mem_Alloc(tempmempool, prog->numfielddefs * sizeof(int)); for (ednum = 0;ednum < prog->max_edicts;ednum++) { ed = PRVM_EDICT_NUM(ednum); if (ed->priv.required->free) continue; - for (i = 1;i < prog->progs->numfielddefs;i++) + for (i = 1;i < prog->numfielddefs;i++) { d = &prog->fielddefs[i]; name = PRVM_GetString(d->s_name); if (name[strlen(name)-2] == '_') continue; // skip _x, _y, _z vars - v = (int *)((char *)ed->fields.vp + d->ofs*4); + v = (int *)(ed->fields.vp + d->ofs); // if the value is still all 0, skip the field for (j = 0;j < prvm_type_size[d->type & ~DEF_SAVEGLOBAL];j++) { @@ -1907,7 +2486,7 @@ void PRVM_Fields_f (void) used = 0; usedamount = 0; tempstring[0] = 0; - for (i = 0;i < prog->progs->numfielddefs;i++) + for (i = 0;i < prog->numfielddefs;i++) { d = &prog->fielddefs[i]; name = PRVM_GetString(d->s_name); @@ -1969,7 +2548,7 @@ void PRVM_Fields_f (void) } } Mem_Free(counts); - Con_Printf("%s: %i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts allocated, %i bytes total spent on edict fields (%i needed)\n", PRVM_NAME, prog->progs->entityfields, used, prog->progs->entityfields * 4, usedamount * 4, prog->max_edicts, prog->progs->entityfields * 4 * prog->max_edicts, usedamount * 4 * prog->max_edicts); + Con_Printf("%s: %i entity fields (%i in use), totalling %i bytes per edict (%i in use), %i edicts allocated, %i bytes total spent on edict fields (%i needed)\n", PRVM_NAME, prog->entityfields, used, prog->entityfields * 4, usedamount * 4, prog->max_edicts, prog->entityfields * 4 * prog->max_edicts, usedamount * 4 * prog->max_edicts); PRVM_End; } @@ -2003,7 +2582,7 @@ void PRVM_Globals_f (void) Con_Printf("%s :", PRVM_NAME); - for (i = 0;i < prog->progs->numglobaldefs;i++) + for (i = 0;i < prog->numglobaldefs;i++) { if(wildcard) if( !matchpattern( PRVM_GetString(prog->globaldefs[i].s_name), wildcard, 1) ) @@ -2013,7 +2592,7 @@ void PRVM_Globals_f (void) } Con_Printf("%s\n", PRVM_GetString(prog->globaldefs[i].s_name)); } - Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->progs->numglobals, numculled, prog->progs->numglobals * 4); + Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->numglobals, numculled, prog->numglobals * 4); PRVM_End; } @@ -2039,7 +2618,7 @@ void PRVM_Global_f(void) if( !global ) Con_Printf( "No global '%s' in %s!\n", Cmd_Argv(2), Cmd_Argv(1) ); else - Con_Printf( "%s: %s\n", Cmd_Argv(2), PRVM_ValueString( (etype_t)global->type, (prvm_eval_t *) &prog->globals.generic[ global->ofs ] ) ); + Con_Printf( "%s: %s\n", Cmd_Argv(2), PRVM_ValueString( (etype_t)global->type, PRVM_GLOBALFIELDVALUE(global->ofs) ) ); PRVM_End; } @@ -2079,26 +2658,33 @@ void PRVM_Init (void) Cmd_AddCommand ("prvm_edicts", PRVM_ED_PrintEdicts_f, "prints all data about all entities in the selected VM (server, client, menu)"); Cmd_AddCommand ("prvm_edictcount", PRVM_ED_Count_f, "prints number of active entities in the selected VM (server, client, menu)"); Cmd_AddCommand ("prvm_profile", PRVM_Profile_f, "prints execution statistics about the most used QuakeC functions in the selected VM (server, client, menu)"); + Cmd_AddCommand ("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 ("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 ("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 ("prvm_globals", PRVM_Globals_f, "prints all global variables in the selected VM (server, client, menu)"); Cmd_AddCommand ("prvm_global", PRVM_Global_f, "prints value of a specified global variable in the selected VM (server, client, menu)"); Cmd_AddCommand ("prvm_globalset", PRVM_GlobalSet_f, "sets value of a specified global variable in the selected VM (server, client, menu)"); Cmd_AddCommand ("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 ("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 ("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 ("prvm_printfunction", PRVM_PrintFunction_f, "prints a disassembly (QuakeC instructions) of the specified function in the selected VM (server, client, menu)"); Cmd_AddCommand ("cl_cmd", PRVM_GameCommand_Client_f, "calls the client QC function GameCommand with the supplied string as argument"); Cmd_AddCommand ("menu_cmd", PRVM_GameCommand_Menu_f, "calls the menu QC function GameCommand with the supplied string as argument"); Cmd_AddCommand ("sv_cmd", PRVM_GameCommand_Server_f, "calls the server QC function GameCommand with the supplied string as argument"); - // LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others)) -#ifdef PRVM_BOUNDSCHECK_CVAR - Cvar_RegisterVariable (&prvm_boundscheck); -#endif + + Cvar_RegisterVariable (&prvm_language); Cvar_RegisterVariable (&prvm_traceqc); Cvar_RegisterVariable (&prvm_statementprofiling); + Cvar_RegisterVariable (&prvm_timeprofiling); Cvar_RegisterVariable (&prvm_backtraceforwarnings); Cvar_RegisterVariable (&prvm_leaktest); Cvar_RegisterVariable (&prvm_leaktest_ignore_classnames); Cvar_RegisterVariable (&prvm_errordump); + Cvar_RegisterVariable (&prvm_reuseedicts_startuptime); + Cvar_RegisterVariable (&prvm_reuseedicts_neverinsameframe); + + // COMMANDLINEOPTION: PRVM: -norunaway disables the runaway loop check (it might be impossible to exit DarkPlaces if used!) + prvm_runawaycheck = !COM_CheckParm("-norunaway"); //VM_Cmd_Init(); } @@ -2110,6 +2696,8 @@ PRVM_InitProg */ void PRVM_InitProg(int prognr) { + static unsigned int progid = 0; + if(prognr < 0 || prognr >= PRVM_MAXPROGS) Sys_Error("PRVM_InitProg: Invalid program number %i",prognr); @@ -2120,19 +2708,20 @@ void PRVM_InitProg(int prognr) memset(prog, 0, sizeof(prvm_prog_t)); prog->starttime = Sys_DoubleTime(); + prog->id = ++progid; prog->error_cmd = Host_Error; - prog->leaktest_active = prvm_leaktest.integer; + prog->leaktest_active = prvm_leaktest.integer != 0; } -int PRVM_GetProgNr() +int PRVM_GetProgNr(void) { return prog - prog_list; } void *_PRVM_Alloc(size_t buffersize, const char *filename, int fileline) { - return _Mem_Alloc(prog->progs_mempool, buffersize, filename, fileline); + return _Mem_Alloc(prog->progs_mempool, NULL, buffersize, 16, filename, fileline); } void _PRVM_Free(void *buffer, const char *filename, int fileline) @@ -2142,111 +2731,61 @@ void _PRVM_Free(void *buffer, const char *filename, int fileline) void _PRVM_FreeAll(const char *filename, int fileline) { - prog->progs = NULL; - prog->fielddefs = NULL; prog->functions = NULL; + prog->strings = NULL; + prog->fielddefs = NULL; + prog->globaldefs = NULL; + prog->statements = NULL; + // FIXME: what about knownstrings? _Mem_EmptyPool(prog->progs_mempool, filename, fileline); } // LordHavoc: turned PRVM_EDICT_NUM into a #define for speed reasons -unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline) +unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, const char *filename, int fileline) { PRVM_ERROR ("PRVM_EDICT_NUM: %s: bad number %i (called at %s:%i)", PRVM_NAME, n, filename, fileline); return 0; } -/* -int NUM_FOR_EDICT_ERROR(prvm_edict_t *e) -{ - PRVM_ERROR ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->edicts); - return 0; -} - -int PRVM_NUM_FOR_EDICT(prvm_edict_t *e) -{ - int n; - n = e - prog->edicts; - if ((unsigned int)n >= prog->limit_edicts) - Host_Error ("PRVM_NUM_FOR_EDICT: bad pointer"); - return n; -} - -//int NoCrash_NUM_FOR_EDICT(prvm_edict_t *e) -//{ -// return e - prog->edicts; -//} - -//#define PRVM_EDICT_TO_PROG(e) ((unsigned char *)(((prvm_edict_t *)e)->v) - (unsigned char *)(prog->edictsfields)) -//#define PRVM_PROG_TO_EDICT(e) (prog->edicts + ((e) / (progs->entityfields * 4))) -int PRVM_EDICT_TO_PROG(prvm_edict_t *e) -{ - int n; - n = e - prog->edicts; - if ((unsigned int)n >= (unsigned int)prog->max_edicts) - Host_Error("PRVM_EDICT_TO_PROG: invalid edict %8p (number %i compared to world at %8p)", e, n, prog->edicts); - return n;// EXPERIMENTAL - //return (unsigned char *)e->v - (unsigned char *)prog->edictsfields; -} -prvm_edict_t *PRVM_PROG_TO_EDICT(int n) -{ - if ((unsigned int)n >= (unsigned int)prog->max_edicts) - Host_Error("PRVM_PROG_TO_EDICT: invalid edict number %i", n); - return prog->edicts + n; // EXPERIMENTAL - //return prog->edicts + ((n) / (progs->entityfields * 4)); -} -*/ - - sizebuf_t vm_tempstringsbuf; +#define PRVM_KNOWNSTRINGBASE 0x40000000 const char *PRVM_GetString(int num) { - if (num >= 0) + if (num < 0) { - if (num < prog->stringssize) - return prog->strings + num; - else -#if 1 - if (num <= prog->stringssize + vm_tempstringsbuf.maxsize) - { - num -= prog->stringssize; - if (num < vm_tempstringsbuf.cursize) - return (char *)vm_tempstringsbuf.data + num; - else - { - VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize); - return ""; - } - } + // invalid + VM_Warning("PRVM_GetString: Invalid string offset (%i < 0)\n", num); + return ""; + } + else if (num < prog->stringssize) + { + // constant string from progs.dat + return prog->strings + num; + } + else if (num <= prog->stringssize + vm_tempstringsbuf.maxsize) + { + // tempstring returned by engine to QC (becomes invalid after returning to engine) + num -= prog->stringssize; + if (num < vm_tempstringsbuf.cursize) + return (char *)vm_tempstringsbuf.data + num; else -#endif { - VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize); + VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize); return ""; } } - else + else if (num & PRVM_KNOWNSTRINGBASE) { - num = -1 - num; -#if 0 - if (num >= (1<<30)) + // allocated string + num = num - PRVM_KNOWNSTRINGBASE; + if (num >= 0 && num < prog->numknownstrings) { - // special range reserved for tempstrings - num -= (1<<30); - if (num < vm_tempstringsbuf.cursize) - return (char *)vm_tempstringsbuf.data + num; - else + if (!prog->knownstrings[num]) { - VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize); + VM_Warning("PRVM_GetString: Invalid zone-string offset (%i has been freed)\n", num); return ""; } - } - else -#endif - if (num < prog->numknownstrings) - { - if (!prog->knownstrings[num]) - VM_Warning("PRVM_GetString: Invalid zone-string offset (%i has been freed)\n", num); return prog->knownstrings[num]; } else @@ -2255,6 +2794,23 @@ const char *PRVM_GetString(int num) return ""; } } + else + { + // invalid string offset + VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize); + return ""; + } +} + +const char *PRVM_ChangeEngineString(int i, const char *s) +{ + const char *old; + i = i - PRVM_KNOWNSTRINGBASE; + if(i < 0 || i >= prog->numknownstrings) + PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string"); + old = prog->knownstrings[i]; + prog->knownstrings[i] = s; + return old; } int PRVM_SetEngineString(const char *s) @@ -2269,16 +2825,14 @@ int PRVM_SetEngineString(const char *s) if (s >= (char *)vm_tempstringsbuf.data && s < (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.maxsize) #if 1 return prog->stringssize + (s - (char *)vm_tempstringsbuf.data); -#else - return -1 - ((1<<30) + (s - (char *)vm_tempstringsbuf.data)); #endif // see if it's a known string address for (i = 0;i < prog->numknownstrings;i++) if (prog->knownstrings[i] == s) - return -1 - i; + return PRVM_KNOWNSTRINGBASE + i; // new unknown engine string - if (developer.integer >= 200) - Con_Printf("new engine string %p = \"%s\"\n", s, s); + if (developer_insane.integer) + Con_DPrintf("new engine string %p = \"%s\"\n", s, s); for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++) if (!prog->knownstrings[i]) break; @@ -2309,7 +2863,7 @@ int PRVM_SetEngineString(const char *s) prog->knownstrings_freeable[i] = false; if(prog->leaktest_active) prog->knownstrings_origin[i] = NULL; - return -1 - i; + return PRVM_KNOWNSTRINGBASE + i; } // temp string handling @@ -2328,8 +2882,8 @@ int PRVM_SetTempString(const char *s) if (!s) return 0; size = (int)strlen(s) + 1; - if (developer.integer >= 300) - Con_Printf("PRVM_SetTempString: cursize %i, size %i\n", vm_tempstringsbuf.cursize, size); + if (developer_insane.integer) + Con_DPrintf("PRVM_SetTempString: cursize %i, size %i\n", vm_tempstringsbuf.cursize, size); if (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size) { sizebuf_t old = vm_tempstringsbuf; @@ -2340,9 +2894,8 @@ int PRVM_SetTempString(const char *s) vm_tempstringsbuf.maxsize *= 2; if (vm_tempstringsbuf.maxsize != old.maxsize || vm_tempstringsbuf.data == NULL) { - if (developer.integer >= 100) - Con_Printf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024); - vm_tempstringsbuf.data = Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize); + Con_DPrintf("PRVM_SetTempString: enlarging tempstrings buffer (%iKB -> %iKB)\n", old.maxsize/1024, vm_tempstringsbuf.maxsize/1024); + vm_tempstringsbuf.data = (unsigned char *) Mem_Alloc(sv_mempool, vm_tempstringsbuf.maxsize); if (old.cursize) memcpy(vm_tempstringsbuf.data, old.data, old.cursize); if (old.data) @@ -2382,7 +2935,12 @@ int PRVM_AllocString(size_t bufferlength, char **pointer) if(prog->leaktest_active) memcpy((char **)prog->knownstrings_origin, oldstrings_origin, prog->numknownstrings * sizeof(char *)); } - // TODO why not Mem_Free the old ones? + if (oldstrings) + Mem_Free((char **)oldstrings); + if (oldstrings_freeable) + Mem_Free((unsigned char *)oldstrings_freeable); + if (oldstrings_origin) + Mem_Free((char **)oldstrings_origin); } prog->numknownstrings++; } @@ -2393,7 +2951,7 @@ int PRVM_AllocString(size_t bufferlength, char **pointer) prog->knownstrings_origin[i] = PRVM_AllocationOrigin(); if (pointer) *pointer = (char *)(prog->knownstrings[i]); - return -1 - i; + return PRVM_KNOWNSTRINGBASE + i; } void PRVM_FreeString(int num) @@ -2402,9 +2960,9 @@ void PRVM_FreeString(int num) PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string"); else if (num >= 0 && num < prog->stringssize) PRVM_ERROR("PRVM_FreeString: attempt to free a constant string"); - else if (num < 0 && num >= -prog->numknownstrings) + else if (num >= PRVM_KNOWNSTRINGBASE && num < PRVM_KNOWNSTRINGBASE + prog->numknownstrings) { - num = -1 - num; + num = num - PRVM_KNOWNSTRINGBASE; if (!prog->knownstrings[num]) PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string"); if (!prog->knownstrings_freeable[num]) @@ -2425,12 +2983,12 @@ static qboolean PRVM_IsStringReferenced(string_t string) { int i, j; - for (i = 0;i < prog->progs->numglobaldefs;i++) + for (i = 0;i < prog->numglobaldefs;i++) { ddef_t *d = &prog->globaldefs[i]; if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string) continue; - if(string == ((prvm_eval_t *) &prog->globals.generic[d->ofs])->string) + if(string == PRVM_GLOBALFIELDSTRING(d->ofs)) return true; } @@ -2439,12 +2997,12 @@ static qboolean PRVM_IsStringReferenced(string_t string) prvm_edict_t *ed = PRVM_EDICT_NUM(j); if (ed->priv.required->free) continue; - for (i=0; iprogs->numfielddefs; ++i) + for (i=0; inumfielddefs; ++i) { ddef_t *d = &prog->fielddefs[i]; if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_string) continue; - if(string == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->string) + if(string == PRVM_EDICTFIELDSTRING(ed, d->ofs)) return true; } } @@ -2483,6 +3041,8 @@ static qboolean PRVM_IsEdictRelevant(prvm_edict_t *edict) { // TODO someone add more stuff here cl_entvars_t *ev = edict->fields.client; + if(ev->entnum) // csqc networked + return true; if(ev->modelindex) // visible ent? return true; if(ev->effects) // particle effect? @@ -2521,12 +3081,12 @@ static qboolean PRVM_IsEdictReferenced(prvm_edict_t *edict, int mark) if(!*targetname) // "" targetname = NULL; - for (i = 0;i < prog->progs->numglobaldefs;i++) + for (i = 0;i < prog->numglobaldefs;i++) { ddef_t *d = &prog->globaldefs[i]; if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity) continue; - if(edictnum == ((prvm_eval_t *) &prog->globals.generic[d->ofs])->edict) + if(edictnum == PRVM_GLOBALFIELDEDICT(d->ofs)) return true; } @@ -2544,12 +3104,12 @@ static qboolean PRVM_IsEdictReferenced(prvm_edict_t *edict, int mark) if(!strcmp(target, targetname)) return true; } - for (i=0; iprogs->numfielddefs; ++i) + for (i=0; inumfielddefs; ++i) { ddef_t *d = &prog->fielddefs[i]; if((etype_t)((int) d->type & ~DEF_SAVEGLOBAL) != ev_entity) continue; - if(edictnum == ((prvm_eval_t *) &((float*)ed->fields.vp)[d->ofs])->edict) + if(edictnum == PRVM_EDICTFIELDEDICT(ed, d->ofs)) return true; } } @@ -2557,7 +3117,7 @@ static qboolean PRVM_IsEdictReferenced(prvm_edict_t *edict, int mark) return false; } -static void PRVM_MarkReferencedEdicts() +static void PRVM_MarkReferencedEdicts(void) { int j; qboolean found_new; @@ -2594,7 +3154,7 @@ static void PRVM_MarkReferencedEdicts() Con_DPrintf("leak check used %d stages to find all references\n", stage); } -void PRVM_LeakTest() +void PRVM_LeakTest(void) { int i, j; qboolean leaked = false; @@ -2608,7 +3168,7 @@ void PRVM_LeakTest() if(prog->knownstrings[i]) if(prog->knownstrings_freeable[i]) if(prog->knownstrings_origin[i]) - if(!PRVM_IsStringReferenced(-1 - i)) + if(!PRVM_IsStringReferenced(PRVM_KNOWNSTRINGBASE + i)) { Con_Printf("Unreferenced string found!\n Value: %s\n Origin: %s\n", prog->knownstrings[i], prog->knownstrings_origin[i]); leaked = true; @@ -2634,7 +3194,7 @@ void PRVM_LeakTest() for (i = 0; i < (int)Mem_ExpandableArray_IndexRange(&prog->stringbuffersarray); ++i) { - prvm_stringbuffer_t *stringbuffer = Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i); + prvm_stringbuffer_t *stringbuffer = (prvm_stringbuffer_t*) Mem_ExpandableArray_RecordAtIndex(&prog->stringbuffersarray, i); if(stringbuffer) if(stringbuffer->origin) {