X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_edict.c;h=9e85cfc7dac516f735d56f1bc77a29ae73790782;hp=3f54cbebe1ddfccb51cf56ed9a5b9a8774f6778f;hb=3c8da461b7565f9c6524c48aecc362270815c3ee;hpb=701925453d9a40b422e3f29fd13e30fe59a9b572 diff --git a/prvm_edict.c b/prvm_edict.c index 3f54cbeb..9e85cfc7 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -32,12 +32,16 @@ ddef_t *PRVM_ED_FieldAtOfs(int ofs); qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s); // LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others)) -cvar_t prvm_boundscheck = {0, "prvm_boundscheck", "1"}; +#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 // LordHavoc: prints every opcode as it executes - warning: this is significant spew -cvar_t prvm_traceqc = {0, "prvm_traceqc", "0"}; +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_backtraceforwarnings = {0, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"}; -ddef_t *PRVM_ED_FindField (const char *name); -mfunction_t *PRVM_ED_FindFunction (const char *name); +extern sizebuf_t vm_tempstringsbuf; //============================================================================ // mempool handling @@ -47,20 +51,20 @@ mfunction_t *PRVM_ED_FindFunction (const char *name); PRVM_MEM_Alloc =============== */ -void PRVM_MEM_Alloc() +void PRVM_MEM_Alloc(void) { int i; // reserve space for the null entity aka world // check bound of max_edicts - prog->max_edicts = bound(1, prog->max_edicts, prog->limit_edicts); - prog->num_edicts = bound(1, prog->num_edicts, prog->max_edicts); + prog->max_edicts = bound(1 + prog->reserved_edicts, prog->max_edicts, prog->limit_edicts); + prog->num_edicts = bound(1 + prog->reserved_edicts, prog->num_edicts, prog->max_edicts); // edictprivate_size has to be min as big prvm_edict_private_t prog->edictprivate_size = max(prog->edictprivate_size,(int)sizeof(prvm_edict_private_t)); // alloc edicts - prog->edicts = Mem_Alloc(prog->progs_mempool,prog->limit_edicts * sizeof(prvm_edict_t)); + prog->edicts = (prvm_edict_t *)Mem_Alloc(prog->progs_mempool,prog->limit_edicts * sizeof(prvm_edict_t)); // alloc edict private space prog->edictprivate = Mem_Alloc(prog->progs_mempool, prog->max_edicts * prog->edictprivate_size); @@ -71,8 +75,8 @@ void PRVM_MEM_Alloc() // set edict pointers for(i = 0; i < prog->max_edicts; i++) { - prog->edicts[i].p.e = (prvm_edict_private_t *)((qbyte *)prog->edictprivate + i * prog->edictprivate_size); - prog->edicts[i].v = (void*)((qbyte *)prog->edictsfields + i * prog->edict_size); + 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); } } @@ -81,7 +85,7 @@ void PRVM_MEM_Alloc() PRVM_MEM_IncreaseEdicts =============== */ -void PRVM_MEM_IncreaseEdicts() +void PRVM_MEM_IncreaseEdicts(void) { int i; int oldmaxedicts = prog->max_edicts; @@ -105,8 +109,8 @@ void PRVM_MEM_IncreaseEdicts() //set e and v pointers for(i = 0; i < prog->max_edicts; i++) { - prog->edicts[i].p.e = (prvm_edict_private_t *)((qbyte *)prog->edictprivate + i * prog->edictprivate_size); - prog->edicts[i].v = (void*)((qbyte *)prog->edictsfields + i * prog->edict_size); + 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); } PRVM_GCALL(end_increase_edicts)(); @@ -123,8 +127,26 @@ int PRVM_ED_FindFieldOffset(const char *field) ddef_t *d; d = PRVM_ED_FindField(field); if (!d) + return -1; + return d->ofs; +} + +int PRVM_ED_FindGlobalOffset(const char *global) +{ + ddef_t *d; + d = PRVM_ED_FindGlobal(global); + if (!d) + return -1; + return d->ofs; +} + +func_t PRVM_ED_FindFunctionOffset(const char *function) +{ + mfunction_t *f; + f = PRVM_ED_FindFunction(function); + if (!f) return 0; - return d->ofs*4; + return (func_t)(f - prog->functions); } qboolean PRVM_ProgLoaded(int prognr) @@ -170,15 +192,15 @@ PRVM_SetProg */ void PRVM_SetProg(int prognr) { - if(prognr && prognr < PRVM_MAXPROGS) + if(0 <= prognr && prognr < PRVM_MAXPROGS) { if(prog_list[prognr].loaded) prog = &prog_list[prognr]; else - PRVM_ERROR("%i(%s) not loaded !\n", prognr, PRVM_NAME); + PRVM_ERROR("%i not loaded !", prognr); return; } - PRVM_ERROR("Invalid program number %i\n", prognr); + PRVM_ERROR("Invalid program number %i", prognr); } /* @@ -190,14 +212,11 @@ Sets everything to NULL */ void PRVM_ED_ClearEdict (prvm_edict_t *e) { - int num; - memset (e->v, 0, prog->progs->entityfields * 4); - e->p.e->free = false; - // LordHavoc: for consistency set these here - num = PRVM_NUM_FOR_EDICT(e) - 1; + memset (e->fields.vp, 0, prog->progs->entityfields * 4); + e->priv.required->free = false; // AK: Let the init_edict function determine if something needs to be initialized - PRVM_GCALL(init_edict)(num); + PRVM_GCALL(init_edict)(e); } /* @@ -221,19 +240,19 @@ prvm_edict_t *PRVM_ED_Alloc (void) // AK: changed i=svs.maxclients+1 // AK: changed so the edict 0 wont spawn -> used as reserved/world entity // although the menu/client has no world - for (i = 1;i < prog->num_edicts;i++) + 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->p.e->free && ( e->p.e->freetime < 2 || (*prog->time - e->p.e->freetime) > 0.5 ) ) + 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 ) ) { PRVM_ED_ClearEdict (e); return e; } } - if (i == MAX_EDICTS) + if (i == prog->limit_edicts) PRVM_ERROR ("%s: PRVM_ED_Alloc: no free edicts",PRVM_NAME); prog->num_edicts++; @@ -256,14 +275,14 @@ FIXME: walk all entities and NULL out references to this entity */ void PRVM_ED_Free (prvm_edict_t *ed) { - // dont delete the null entity (world) - if(PRVM_NUM_FOR_EDICT(ed) == 0) + // dont delete the null entity (world) or reserved edicts + if(PRVM_NUM_FOR_EDICT(ed) <= prog->reserved_edicts ) return; PRVM_GCALL(free_edict)(ed); - ed->p.e->free = true; - ed->p.e->freetime = *prog->time; + ed->priv.required->free = true; + ed->priv.required->freetime = prog->globaloffsets.time >= 0 ? PRVM_GLOBALFIELDVALUE(prog->globaloffsets.time)->_float : 0; } //=========================================================================== @@ -374,12 +393,12 @@ Returns a string describing *data in a type specific manner */ char *PRVM_ValueString (etype_t type, prvm_eval_t *val) { - static char line[1024]; // LordHavoc: enlarged a bit (was 256) + static char line[MAX_INPUTLINE]; ddef_t *def; mfunction_t *f; int n; - type &= ~DEF_SAVEGLOBAL; + type = (etype_t)((int) type & ~DEF_SAVEGLOBAL); switch (type) { @@ -388,7 +407,7 @@ char *PRVM_ValueString (etype_t type, prvm_eval_t *val) break; case ev_entity: n = val->edict; - if (n < 0 || n >= MAX_EDICTS) + if (n < 0 || n >= prog->limit_edicts) sprintf (line, "entity %i (invalid!)", n); else sprintf (line, "entity %i", n); @@ -416,7 +435,7 @@ char *PRVM_ValueString (etype_t type, prvm_eval_t *val) sprintf (line, "pointer"); break; default: - sprintf (line, "bad type %i", type); + sprintf (line, "bad type %i", (int) type); break; } @@ -433,13 +452,13 @@ Easier to parse than PR_ValueString */ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val) { - static char line[4096]; + static char line[MAX_INPUTLINE]; int i; - char *s; + const char *s; ddef_t *def; mfunction_t *f; - type &= ~DEF_SAVEGLOBAL; + type = (etype_t)((int)type & ~DEF_SAVEGLOBAL); switch (type) { @@ -470,7 +489,7 @@ char *PRVM_UglyValueString (etype_t type, prvm_eval_t *val) dpsnprintf (line, sizeof (line), "%i", PRVM_NUM_FOR_EDICT(PRVM_PROG_TO_EDICT(val->edict))); break; case ev_function: - f = pr_functions + val->function; + f = prog->functions + val->function; strlcpy (line, PRVM_GetString (f->s_name), sizeof (line)); break; case ev_field: @@ -505,45 +524,45 @@ padded to 20 field width char *PRVM_GlobalString (int ofs) { char *s; - int i; + //size_t i; ddef_t *def; void *val; static char line[128]; - val = (void *)&prog->globals[ofs]; + val = (void *)&prog->globals.generic[ofs]; def = PRVM_ED_GlobalAtOfs(ofs); if (!def) - sprintf (line,"%i(?)", ofs); + sprintf (line,"GLOBAL%i", ofs); else { - s = PRVM_ValueString (def->type, val); - sprintf (line,"%i(%s)%s", ofs, PRVM_GetString(def->s_name), s); + s = PRVM_ValueString ((etype_t)def->type, (prvm_eval_t *)val); + sprintf (line,"%s (=%s)", PRVM_GetString(def->s_name), s); } - i = strlen(line); - for ( ; i<20 ; i++) - strcat (line," "); - strcat (line," "); + //i = strlen(line); + //for ( ; i<20 ; i++) + // strcat (line," "); + //strcat (line," "); return line; } char *PRVM_GlobalStringNoContents (int ofs) { - int i; + //size_t i; ddef_t *def; static char line[128]; def = PRVM_ED_GlobalAtOfs(ofs); if (!def) - sprintf (line,"%i(?)", ofs); + sprintf (line,"GLOBAL%i", ofs); else - sprintf (line,"%i(%s)", ofs, PRVM_GetString(def->s_name)); + sprintf (line,"%s", PRVM_GetString(def->s_name)); - i = strlen(line); - for ( ; i<20 ; i++) - strcat (line," "); - strcat (line," "); + //i = strlen(line); + //for ( ; i<20 ; i++) + // strcat (line," "); + //strcat (line," "); return line; } @@ -558,17 +577,17 @@ For debugging */ // LordHavoc: optimized this to print out much more quickly (tempstring) // LordHavoc: changed to print out every 4096 characters (incase there are a lot of fields to print) -void PRVM_ED_Print(prvm_edict_t *ed) +void PRVM_ED_Print(prvm_edict_t *ed, const char *wildcard_fieldname) { - int l; + size_t l; ddef_t *d; int *v; int i, j; - char *name; + const char *name; int type; - char tempstring[8192], tempstring2[260]; // temporary string buffers + char tempstring[MAX_INPUTLINE], tempstring2[260]; // temporary string buffers - if (ed->p.e->free) + if (ed->priv.required->free) { Con_Printf("%s: FREE\n",PRVM_NAME); return; @@ -583,7 +602,13 @@ void PRVM_ED_Print(prvm_edict_t *ed) if (name[strlen(name)-2] == '_') continue; // skip _x, _y, _z vars - v = (int *)((char *)ed->v + d->ofs*4); + // Check Field Name Wildcard + if(wildcard_fieldname) + if( !matchpattern(name, wildcard_fieldname, 1) ) + // Didn't match; skip + continue; + + v = (int *)((char *)ed->fields.vp + d->ofs*4); // if the value is still all 0, skip the field type = d->type & ~DEF_SAVEGLOBAL; @@ -594,29 +619,29 @@ void PRVM_ED_Print(prvm_edict_t *ed) if (j == prvm_type_size[type]) continue; - if (strlen(name) > 256) + if (strlen(name) > sizeof(tempstring2)-4) { - memcpy (tempstring2, name, 256); - tempstring2[256] = tempstring2[257] = tempstring2[258] = '.'; - tempstring2[259] = 0; + memcpy (tempstring2, name, sizeof(tempstring2)-4); + tempstring2[sizeof(tempstring2)-4] = tempstring2[sizeof(tempstring2)-3] = tempstring2[sizeof(tempstring2)-2] = '.'; + tempstring2[sizeof(tempstring2)-1] = 0; name = tempstring2; } - strcat(tempstring, name); + strlcat(tempstring, name, sizeof(tempstring)); for (l = strlen(name);l < 14;l++) - strcat(tempstring, " "); - strcat(tempstring, " "); + strlcat(tempstring, " ", sizeof(tempstring)); + strlcat(tempstring, " ", sizeof(tempstring)); - name = PRVM_ValueString(d->type, (prvm_eval_t *)v); - if (strlen(name) > 256) + name = PRVM_ValueString((etype_t)d->type, (prvm_eval_t *)v); + if (strlen(name) > sizeof(tempstring2)-4) { - memcpy (tempstring2, name, 256); - tempstring2[256] = tempstring2[257] = tempstring2[258] = '.'; - tempstring2[259] = 0; + memcpy (tempstring2, name, sizeof(tempstring2)-4); + tempstring2[sizeof(tempstring2)-4] = tempstring2[sizeof(tempstring2)-3] = tempstring2[sizeof(tempstring2)-2] = '.'; + tempstring2[sizeof(tempstring2)-1] = 0; name = tempstring2; } - strcat(tempstring, name); - strcat(tempstring, "\n"); - if (strlen(tempstring) >= 4096) + strlcat(tempstring, name, sizeof(tempstring)); + strlcat(tempstring, "\n", sizeof(tempstring)); + if (strlen(tempstring) >= sizeof(tempstring)/2) { Con_Print(tempstring); tempstring[0] = 0; @@ -638,12 +663,12 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) ddef_t *d; int *v; int i, j; - char *name; + const char *name; int type; FS_Print(f, "{\n"); - if (ed->p.e->free) + if (ed->priv.required->free) { FS_Print(f, "}\n"); return; @@ -656,7 +681,7 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) if (name[strlen(name)-2] == '_') continue; // skip _x, _y, _z vars - v = (int *)((char *)ed->v + d->ofs*4); + v = (int *)((char *)ed->fields.vp + d->ofs*4); // if the value is still all 0, skip the field type = d->type & ~DEF_SAVEGLOBAL; @@ -667,15 +692,15 @@ void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed) continue; FS_Printf(f,"\"%s\" ",name); - FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(d->type, (prvm_eval_t *)v)); + FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)d->type, (prvm_eval_t *)v)); } FS_Print(f, "}\n"); } -void PRVM_ED_PrintNum (int ent) +void PRVM_ED_PrintNum (int ent, const char *wildcard_fieldname) { - PRVM_ED_Print(PRVM_EDICT_NUM(ent)); + PRVM_ED_Print(PRVM_EDICT_NUM(ent), wildcard_fieldname); } /* @@ -688,10 +713,11 @@ For debugging, prints all the entities in the current server void PRVM_ED_PrintEdicts_f (void) { int i; + const char *wildcard_fieldname; - if(Cmd_Argc() != 2) + if(Cmd_Argc() < 2 || Cmd_Argc() > 3) { - Con_Print("prvm_edicts \n"); + Con_Print("prvm_edicts \n"); return; } @@ -699,9 +725,14 @@ void PRVM_ED_PrintEdicts_f (void) if(!PRVM_SetProgFromString(Cmd_Argv(1))) return; + if( Cmd_Argc() == 3) + wildcard_fieldname = Cmd_Argv(2); + else + wildcard_fieldname = NULL; + Con_Printf("%s: %i entities\n", PRVM_NAME, prog->num_edicts); for (i=0 ; inum_edicts ; i++) - PRVM_ED_PrintNum (i); + PRVM_ED_PrintNum (i, wildcard_fieldname); PRVM_End; } @@ -716,10 +747,11 @@ For debugging, prints a single edict void PRVM_ED_PrintEdict_f (void) { int i; + const char *wildcard_fieldname; - if(Cmd_Argc() != 3) + if(Cmd_Argc() < 3 || Cmd_Argc() > 4) { - Con_Print("prvm_edict \n"); + Con_Print("prvm_edict \n"); return; } @@ -734,7 +766,13 @@ void PRVM_ED_PrintEdict_f (void) PRVM_End; return; } - PRVM_ED_PrintNum (i); + if( Cmd_Argc() == 4) + // Optional Wildcard Provided + wildcard_fieldname = Cmd_Argv(3); + else + // Use All + wildcard_fieldname = NULL; + PRVM_ED_PrintNum (i, wildcard_fieldname); PRVM_End; } @@ -772,7 +810,7 @@ void PRVM_ED_Count_f (void) for (i=0 ; inum_edicts ; i++) { ent = PRVM_EDICT_NUM(i); - if (ent->p.e->free) + if (ent->priv.required->free) continue; active++; } @@ -802,7 +840,7 @@ void PRVM_ED_WriteGlobals (qfile_t *f) { ddef_t *def; int i; - char *name; + const char *name; int type; FS_Print(f,"{\n"); @@ -819,7 +857,7 @@ void PRVM_ED_WriteGlobals (qfile_t *f) name = PRVM_GetString(def->s_name); FS_Printf(f,"\"%s\" ", name); - FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString(type, (prvm_eval_t *)&prog->globals[def->ofs])); + FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs])); } FS_Print(f,"}\n"); } @@ -831,25 +869,25 @@ PRVM_ED_ParseGlobals */ void PRVM_ED_ParseGlobals (const char *data) { - char keyname[1024]; // LordHavoc: good idea? bad idea? was 64 + char keyname[MAX_INPUTLINE]; ddef_t *key; while (1) { // parse key - if (!COM_ParseToken(&data, false)) - PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace"); + if (!COM_ParseToken_Simple(&data, false, false)) + PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace"); if (com_token[0] == '}') break; - strcpy (keyname, com_token); + strlcpy (keyname, com_token, sizeof(keyname)); // parse value - if (!COM_ParseToken(&data, false)) - PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace"); + if (!COM_ParseToken_Simple(&data, false, true)) + PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace"); if (com_token[0] == '}') - PRVM_ERROR ("PRVM_ED_ParseEntity: closing brace without data"); + PRVM_ERROR ("PRVM_ED_ParseGlobals: closing brace without data"); key = PRVM_ED_FindGlobal (keyname); if (!key) @@ -866,37 +904,6 @@ void PRVM_ED_ParseGlobals (const char *data) //============================================================================ -/* -============= -PRVM_ED_NewString -============= -*/ -char *PRVM_ED_NewString (const char *string) -{ - char *new, *new_p; - int i,l; - - l = strlen(string) + 1; - new = Mem_Alloc(prog->progs_mempool, l); - new_p = new; - - for (i=0 ; i< l ; i++) - { - if (string[i] == '\\' && i < l-1) - { - i++; - if (string[i] == 'n') - *new_p++ = '\n'; - else - *new_p++ = '\\'; - } - else - *new_p++ = string[i]; - } - - return new; -} - /* ============= PRVM_ED_ParseEval @@ -907,19 +914,36 @@ returns false if error */ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s) { - int i; + int i, l; + char *new_p; ddef_t *def; prvm_eval_t *val; mfunction_t *func; if (ent) - val = (prvm_eval_t *)((int *)ent->v + key->ofs); + val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs); else - val = (prvm_eval_t *)((int *)prog->globals + key->ofs); + val = (prvm_eval_t *)((int *)prog->globals.generic + key->ofs); switch (key->type & ~DEF_SAVEGLOBAL) { case ev_string: - val->string = PRVM_SetString(PRVM_ED_NewString(s)); + l = (int)strlen(s) + 1; + val->string = PRVM_AllocString(l, &new_p); + for (i = 0;i < l;i++) + { + if (s[i] == '\\' && i < l-1) + { + i++; + if (s[i] == 'n') + *new_p++ = '\n'; + else if (s[i] == 'r') + *new_p++ = '\r'; + else + *new_p++ = s[i]; + } + else + *new_p++ = s[i]; + } break; case ev_float: @@ -947,15 +971,14 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s) while (*s && *s <= ' ') s++; i = atoi(s); - if (i < 0 || i >= MAX_EDICTS) - Con_Printf("PRVM_ED_ParseEpair: ev_entity reference too large (edict %i >= MAX_EDICTS %i) on %s\n", i, MAX_EDICTS, PRVM_NAME); + 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); while (i >= prog->max_edicts) PRVM_MEM_IncreaseEdicts(); - //SV_IncreaseEdicts(); - // if SV_IncreaseEdicts was called the base pointer needs to be updated + // if IncreaseEdicts was called the base pointer needs to be updated if (ent) - val = (prvm_eval_t *)((int *)ent->v + key->ofs); - val->edict = PRVM_EDICT_TO_PROG(EDICT_NUM(i)); + val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs); + val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i)); break; case ev_field: @@ -979,12 +1002,77 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s) break; default: - Con_Printf("PRVM_ED_ParseEpair: Unknown key->type %i for key \"%s\" on %s\n", key->type, PR_GetString(key->s_name), PRVM_NAME); + Con_Printf("PRVM_ED_ParseEpair: Unknown key->type %i for key \"%s\" on %s\n", key->type, PRVM_GetString(key->s_name), PRVM_NAME); return false; } return true; } +/* +============= +PRVM_GameCommand_f + +Console command to send a string to QC function GameCommand of the +indicated progs + +Usage: + sv_cmd adminmsg 3 "do not teamkill" + cl_cmd someclientcommand + menu_cmd somemenucommand + +All progs can support this extension; sg calls it in server QC, cg in client +QC, mg in menu QC. +============= +*/ +void PRVM_GameCommand(const char *whichprogs, const char *whichcmd) +{ + if(Cmd_Argc() < 1) + { + Con_Printf("%s text...\n", whichcmd); + return; + } + + PRVM_Begin; + if(!PRVM_SetProgFromString(whichprogs)) + // note: this is not PRVM_SetProg because that one aborts "hard" using PRVM_Error + // also, it makes printing error messages easier! + { + Con_Printf("%s program not loaded.\n", whichprogs); + return; + } + + if(!prog->funcoffsets.GameCommand) + { + Con_Printf("%s program do not support GameCommand!\n", whichprogs); + } + else + { + int restorevm_tempstringsbuf_cursize; + const char *s; + + s = Cmd_Args(); + + 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"); + vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; + } + + PRVM_End; +} +void PRVM_GameCommand_Server_f(void) +{ + PRVM_GameCommand("server", "sv_cmd"); +} +void PRVM_GameCommand_Client_f(void) +{ + PRVM_GameCommand("client", "cl_cmd"); +} +void PRVM_GameCommand_Menu_f(void) +{ + PRVM_GameCommand("menu", "menu_cmd"); +} + /* ============= PRVM_ED_EdictSet_f @@ -1029,13 +1117,14 @@ 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; qboolean anglehack; qboolean init; char keyname[256]; - int n; + size_t n; init = false; @@ -1043,8 +1132,10 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) while (1) { // parse key - if (!COM_ParseToken(&data, false)) - PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace"); + if (!COM_ParseToken_Simple(&data, false, false)) + PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace"); + if (developer_entityparsing.integer) + Con_Printf("Key: \"%s\"", com_token); if (com_token[0] == '}') break; @@ -1052,7 +1143,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) // and allow them to be turned into vectors. (FIXME...) if (!strcmp(com_token, "angle")) { - strcpy (com_token, "angles"); + strlcpy (com_token, "angles", sizeof(com_token)); anglehack = true; } else @@ -1060,9 +1151,9 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) // FIXME: change light to _light to get rid of this hack if (!strcmp(com_token, "light")) - strcpy (com_token, "light_lev"); // hack for single light def + strlcpy (com_token, "light_lev", sizeof(com_token)); // hack for single light def - strcpy (keyname, com_token); + strlcpy (keyname, com_token, sizeof(keyname)); // another hack to fix keynames with trailing spaces n = strlen(keyname); @@ -1073,14 +1164,20 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) } // parse value - if (!COM_ParseToken(&data, false)) - PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace"); + if (!COM_ParseToken_Simple(&data, false, true)) + PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace"); + if (developer_entityparsing.integer) + Con_Printf(" \"%s\"\n", com_token); if (com_token[0] == '}') - PRVM_ERROR ("PRVM_ED_ParseEntity: closing brace without data"); + PRVM_ERROR ("PRVM_ED_ParseEdict: closing brace without data"); init = true; + // ignore attempts to set key "" (this problem occurs in nehahra neh1m8.bsp) + if (!keyname[0]) + continue; + // keynames with a leading underscore are used for utility comments, // and are immediately discarded by quake if (keyname[0] == '_') @@ -1096,7 +1193,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) if (anglehack) { char temp[32]; - strcpy (temp, com_token); + strlcpy (temp, com_token, sizeof(temp)); sprintf (com_token, "0 %s 0", temp); } @@ -1105,7 +1202,7 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent) } if (!init) - ent->p.e->free = true; + ent->priv.required->free = true; return data; } @@ -1130,6 +1227,7 @@ void PRVM_ED_LoadFromFile (const char *data) { prvm_edict_t *ent; int parsed, inhibited, spawned, died; + const char *funcname; mfunction_t *func; parsed = 0; @@ -1142,20 +1240,23 @@ void PRVM_ED_LoadFromFile (const char *data) while (1) { // parse the opening brace - if (!COM_ParseToken(&data, false)) + if (!COM_ParseToken_Simple(&data, false, false)) break; if (com_token[0] != '{') PRVM_ERROR ("PRVM_ED_LoadFromFile: %s: found %s when expecting {", PRVM_NAME, com_token); - // CHANGED: this is not conform to ED_LoadFromFile - if(!prog->num_edicts) + // CHANGED: this is not conform to PR_LoadFromFile + if(prog->loadintoworld) + { + prog->loadintoworld = false; ent = PRVM_EDICT_NUM(0); + } else ent = PRVM_ED_Alloc(); // clear it if (ent != prog->edicts) // hack - memset (ent->v, 0, prog->progs->entityfields * 4); + memset (ent->fields.vp, 0, prog->progs->entityfields * 4); data = PRVM_ED_ParseEdict (data, ent); parsed++; @@ -1171,44 +1272,216 @@ void PRVM_ED_LoadFromFile (const char *data) // // immediately call spawn function, but only if there is a self global and a classname // - if(prog->self && prog->flag & PRVM_FE_CLASSNAME) + if(prog->globaloffsets.self >= 0 && prog->fieldoffsets.classname >= 0) { - string_t handle = *(string_t*)&((float*)ent->v)[PRVM_ED_FindFieldOffset("classname")]; + string_t handle = PRVM_EDICTFIELDVALUE(ent, prog->fieldoffsets.classname)->string; if (!handle) { Con_Print("No classname for:\n"); - PRVM_ED_Print(ent); + PRVM_ED_Print(ent, NULL); PRVM_ED_Free (ent); continue; } // look for the spawn function - func = PRVM_ED_FindFunction (PRVM_GetString(handle)); + funcname = PRVM_GetString(handle); + func = PRVM_ED_FindFunction (va("spawnfunc_%s", funcname)); + if(!func) + func = PRVM_ED_FindFunction (funcname); if (!func) { - if (developer.integer) // don't confuse non-developers with errors + // check for OnEntityNoSpawnFunction + if (prog->funcoffsets.SV_OnEntityNoSpawnFunction) { - Con_Print("No spawn function for:\n"); - PRVM_ED_Print(ent); + // 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"); + } + else + { + if (developer.integer) // don't confuse non-developers with errors + { + Con_Print("No spawn function for:\n"); + PRVM_ED_Print(ent, NULL); + } + PRVM_ED_Free (ent); + continue; } - PRVM_ED_Free (ent); - continue; } - - // self = ent - PRVM_G_INT(prog->self->ofs) = PRVM_EDICT_TO_PROG(ent); - PRVM_ExecuteProgram (func - prog->functions, ""); + else + { + // self = ent + PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict = PRVM_EDICT_TO_PROG(ent); + PRVM_ExecuteProgram (func - prog->functions, ""); + } } spawned++; - if (ent->p.e->free) + 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); } +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 + 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.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_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"); + + // 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"); +} + // not used /* typedef struct dpfield_s @@ -1233,20 +1506,57 @@ PRVM_ResetProg void PRVM_ResetProg() { - /*mempool_t *t1; - - t1 = prog->progs_mempool; - - Mem_EmptyPool(prog->progs_mempool);*/ + PRVM_GCALL(reset_cmd)(); Mem_FreePool(&prog->progs_mempool); - memset(prog,0,sizeof(prvm_prog_t)); + prog->starttime = Sys_DoubleTime(); +} - /*prog->time = &prog->_time; +/* +=============== +PRVM_LoadLNO +=============== +*/ +void PRVM_LoadLNO( const char *progname ) { + fs_offset_t filesize; + unsigned char *lno; + unsigned int *header; + char filename[512]; - prog->progs_mempool = t1;*/ + FS_StripExtension( progname, filename, sizeof( filename ) ); + strlcat( filename, ".lno", sizeof( filename ) ); - PRVM_GCALL(reset_cmd)(); + lno = FS_LoadFile( filename, tempmempool, false, &filesize ); + if( !lno ) { + return; + } + +/* + SafeWrite (h, &lnotype, sizeof(int)); + SafeWrite (h, &version, sizeof(int)); + SafeWrite (h, &numglobaldefs, sizeof(int)); + SafeWrite (h, &numpr_globals, sizeof(int)); + SafeWrite (h, &numfielddefs, sizeof(int)); + SafeWrite (h, &numstatements, sizeof(int)); + SafeWrite (h, statement_linenums, numstatements*sizeof(int)); +*/ + if( (unsigned) filesize < (6 + prog->progs->numstatements) * sizeof( int ) ) { + Mem_Free(lno); + return; + } + + 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 ) + { + 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 ); } /* @@ -1254,22 +1564,25 @@ void PRVM_ResetProg() PRVM_LoadProgs =============== */ -void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required_func) +void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global) { int i; dstatement_t *st; ddef_t *infielddefs; dfunction_t *dfunctions; + fs_offset_t filesize; - Mem_EmptyPool(prog->progs_mempool); + 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); - if (prog->progs == NULL) + prog->progs = (dprograms_t *)FS_LoadFile (filename, prog->progs_mempool, false, &filesize); + if (prog->progs == NULL || filesize < (fs_offset_t)sizeof(dprograms_t)) PRVM_ERROR ("PRVM_LoadProgs: couldn't load %s for %s", filename, PRVM_NAME); - Con_DPrintf("%s programs occupy %iK.\n", PRVM_NAME, fs_filesize/1024); + Con_DPrintf("%s programs occupy %iK.\n", PRVM_NAME, (int)(filesize/1024)); - pr_crc = CRC_Block((qbyte *)prog->progs, fs_filesize); + prog->filecrc = CRC_Block((unsigned char *)prog->progs, filesize); // byte swap the header for (i = 0;i < (int) sizeof(*prog->progs) / 4;i++) @@ -1277,26 +1590,40 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required 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->crc) - PRVM_ERROR ("%s: %s system vars have been modified, progdefs.h is out of date", PRVM_NAME, filename); + 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); - //pr_functions = (dfunction_t *)((qbyte *)progs + progs->ofs_functions); - dfunctions = (dfunction_t *)((qbyte *)prog->progs + prog->progs->ofs_functions); + //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) + PRVM_ERROR ("%s: %s strings go past end of file", PRVM_NAME, filename); prog->strings = (char *)prog->progs + prog->progs->ofs_strings; - prog->globaldefs = (ddef_t *)((qbyte *)prog->progs + prog->progs->ofs_globaldefs); + prog->stringssize = prog->progs->numstrings; + + prog->numknownstrings = 0; + prog->maxknownstrings = 0; + prog->knownstrings = NULL; + prog->knownstrings_freeable = NULL; + + 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 *)((qbyte *)prog->progs + prog->progs->ofs_fielddefs); + infielddefs = (ddef_t *)((unsigned char *)prog->progs + prog->progs->ofs_fielddefs); // ( + DPFIELDS ) - prog->fielddefs = Mem_Alloc(prog->progs_mempool, prog->progs->numfielddefs * sizeof(ddef_t)); + 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->statements = (dstatement_t *)((qbyte *)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 *)((qbyte *)progs + progs->ofs_globals); - prog->globals = (float *)((qbyte *)prog->progs + prog->progs->ofs_globals); + //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++) @@ -1307,7 +1634,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required prog->statements[i].c = LittleShort(prog->statements[i].c); } - prog->functions = Mem_Alloc(prog->progs_mempool, sizeof(mfunction_t) * prog->progs->numfunctions); + 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); @@ -1336,31 +1663,36 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required prog->fielddefs[i].s_name = LittleLong (infielddefs[i].s_name); } -/* // append the darkplaces fields - for (i = 0;i < (int) DPFIELDS;i++) + // append the required fields + for (i = 0;i < (int) numrequiredfields;i++) { - pr_fielddefs[progs->numfielddefs].type = dpfields[i].type; - pr_fielddefs[progs->numfielddefs].ofs = progs->entityfields; - pr_fielddefs[progs->numfielddefs].s_name = PR_SetString(dpfields[i].string); - if (pr_fielddefs[progs->numfielddefs].type == ev_vector) - progs->entityfields += 3; + 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; else - progs->entityfields++; - progs->numfielddefs++; - }*/ + prog->progs->entityfields++; + prog->progs->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\n",PRVM_NAME, required_func[i], filename); + PRVM_ERROR("%s: %s not found in %s",PRVM_NAME, required_func[i], filename); + + // 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); for (i=0 ; iprogs->numglobals ; i++) - ((int *)prog->globals)[i] = LittleLong (((int *)prog->globals)[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 edict_t header + // LordHavoc: this no longer includes the prvm_edict_t header prog->edict_size = prog->progs->entityfields * 4; - prog->edictareasize = prog->edict_size * MAX_EDICTS; + 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++) @@ -1370,11 +1702,11 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_IF: case OP_IFNOT: if ((unsigned short) st->a >= prog->progs->numglobals || st->b + i < 0 || st->b + i >= prog->progs->numstatements) - PRVM_ERROR("PRVM_LoadProgs: out of bounds IF/IFNOT (statement %d) in %s\n", i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: out of bounds IF/IFNOT (statement %d) in %s", i, PRVM_NAME); break; case OP_GOTO: if (st->a + i < 0 || st->a + i >= prog->progs->numstatements) - PRVM_ERROR("PRVM_LoadProgs: out of bounds GOTO (statement %d) in %s\n", i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: out of bounds GOTO (statement %d) in %s", i, PRVM_NAME); break; // global global global case OP_ADD_F: @@ -1412,7 +1744,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required 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) - PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d)\n", i); + PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d)", i); break; // global none global case OP_NOT_F: @@ -1421,7 +1753,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_NOT_FNC: case OP_NOT_ENT: if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->c >= prog->progs->numglobals) - PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s\n", i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); break; // 2 globals case OP_STOREP_F: @@ -1438,7 +1770,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_STOREP_V: case OP_STORE_V: if ((unsigned short) st->a >= prog->progs->numglobals || (unsigned short) st->b >= prog->progs->numglobals) - PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d)\n in %s", i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); break; // 1 global case OP_CALL0: @@ -1453,14 +1785,16 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required case OP_DONE: case OP_RETURN: if ((unsigned short) st->a >= prog->progs->numglobals) - PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s\n", i, PRVM_NAME); + PRVM_ERROR("PRVM_LoadProgs: out of bounds global index (statement %d) in %s", i, PRVM_NAME); break; default: - PRVM_ERROR("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", st->op, i, PRVM_NAME); + Con_DPrintf("PRVM_LoadProgs: unknown opcode %d at statement %d in %s\n", st->op, i, PRVM_NAME); break; } } + PRVM_LoadLNO(filename); + PRVM_Init_Exec(); prog->loaded = TRUE; @@ -1469,22 +1803,8 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required prog->flag = 0; - prog->self = PRVM_ED_FindGlobal("self"); - - if( PRVM_ED_FindGlobal("time") && PRVM_ED_FindGlobal("time")->type & ev_float ) - prog->time = &PRVM_G_FLOAT(PRVM_ED_FindGlobal("time")->ofs); + PRVM_FindOffsets(); - if(PRVM_ED_FindField ("chain")) - prog->flag |= PRVM_FE_CHAIN; - - if(PRVM_ED_FindField ("classname")) - prog->flag |= PRVM_FE_CLASSNAME; - - if(PRVM_ED_FindField ("nextthink") && PRVM_ED_FindField ("frame") && PRVM_ED_FindField ("think") - && prog->flag && prog->self) - prog->flag |= PRVM_OP_STATE; - - PRVM_GCALL(reset_cmd)(); PRVM_GCALL(init_cmd)(); // init mempools @@ -1496,7 +1816,8 @@ void PRVM_Fields_f (void) { int i, j, ednum, used, usedamount; int *counts; - char tempstring[5000], tempstring2[260], *name; + char tempstring[MAX_INPUTLINE], tempstring2[260]; + const char *name; prvm_edict_t *ed; ddef_t *d; int *v; @@ -1520,11 +1841,11 @@ void PRVM_Fields_f (void) if(!PRVM_SetProgFromString(Cmd_Argv(1))) return; - counts = Mem_Alloc(tempmempool, prog->progs->numfielddefs * sizeof(int)); + counts = (int *)Mem_Alloc(tempmempool, prog->progs->numfielddefs * sizeof(int)); for (ednum = 0;ednum < prog->max_edicts;ednum++) { ed = PRVM_EDICT_NUM(ednum); - if (ed->p.e->free) + if (ed->priv.required->free) continue; for (i = 1;i < prog->progs->numfielddefs;i++) { @@ -1532,7 +1853,7 @@ void PRVM_Fields_f (void) name = PRVM_GetString(d->s_name); if (name[strlen(name)-2] == '_') continue; // skip _x, _y, _z vars - v = (int *)((char *)ed->v + d->ofs*4); + v = (int *)((char *)ed->fields.vp + d->ofs*4); // if the value is still all 0, skip the field for (j = 0;j < prvm_type_size[d->type & ~DEF_SAVEGLOBAL];j++) { @@ -1556,48 +1877,48 @@ void PRVM_Fields_f (void) switch(d->type & ~DEF_SAVEGLOBAL) { case ev_string: - strcat(tempstring, "string "); + strlcat(tempstring, "string ", sizeof(tempstring)); break; case ev_entity: - strcat(tempstring, "entity "); + strlcat(tempstring, "entity ", sizeof(tempstring)); break; case ev_function: - strcat(tempstring, "function "); + strlcat(tempstring, "function ", sizeof(tempstring)); break; case ev_field: - strcat(tempstring, "field "); + strlcat(tempstring, "field ", sizeof(tempstring)); break; case ev_void: - strcat(tempstring, "void "); + strlcat(tempstring, "void ", sizeof(tempstring)); break; case ev_float: - strcat(tempstring, "float "); + strlcat(tempstring, "float ", sizeof(tempstring)); break; case ev_vector: - strcat(tempstring, "vector "); + strlcat(tempstring, "vector ", sizeof(tempstring)); break; case ev_pointer: - strcat(tempstring, "pointer "); + strlcat(tempstring, "pointer ", sizeof(tempstring)); break; default: sprintf (tempstring2, "bad type %i ", d->type & ~DEF_SAVEGLOBAL); - strcat(tempstring, tempstring2); + strlcat(tempstring, tempstring2, sizeof(tempstring)); break; } - if (strlen(name) > 256) + if (strlen(name) > sizeof(tempstring2)-4) { - memcpy (tempstring2, name, 256); - tempstring2[256] = tempstring2[257] = tempstring2[258] = '.'; - tempstring2[259] = 0; + memcpy (tempstring2, name, sizeof(tempstring2)-4); + tempstring2[sizeof(tempstring2)-4] = tempstring2[sizeof(tempstring2)-3] = tempstring2[sizeof(tempstring2)-2] = '.'; + tempstring2[sizeof(tempstring2)-1] = 0; name = tempstring2; } - strcat(tempstring, name); - for (j = strlen(name);j < 25;j++) - strcat(tempstring, " "); + strlcat(tempstring, name, sizeof(tempstring)); + for (j = (int)strlen(name);j < 25;j++) + strlcat(tempstring, " ", sizeof(tempstring)); sprintf(tempstring2, "%5d", counts[i]); - strcat(tempstring, tempstring2); - strcat(tempstring, "\n"); - if (strlen(tempstring) >= 4096) + strlcat(tempstring, tempstring2, sizeof(tempstring)); + strlcat(tempstring, "\n", sizeof(tempstring)); + if (strlen(tempstring) >= sizeof(tempstring)/2) { Con_Print(tempstring); tempstring[0] = 0; @@ -1617,15 +1938,18 @@ void PRVM_Fields_f (void) void PRVM_Globals_f (void) { int i; + const char *wildcard; + int numculled; + numculled = 0; // TODO /*if (!sv.active) { Con_Print("no progs loaded\n"); return; }*/ - if(Cmd_Argc () != 2) + if(Cmd_Argc () < 2 || Cmd_Argc() > 3) { - Con_Print("prvm_globals \n"); + Con_Print("prvm_globals \n"); return; } @@ -1633,11 +1957,24 @@ void PRVM_Globals_f (void) if(!PRVM_SetProgFromString (Cmd_Argv (1))) return; + if( Cmd_Argc() == 3) + wildcard = Cmd_Argv(2); + else + wildcard = NULL; + Con_Printf("%s :", PRVM_NAME); for (i = 0;i < prog->progs->numglobaldefs;i++) + { + if(wildcard) + if( !matchpattern( PRVM_GetString(prog->globaldefs[i].s_name), wildcard, 1) ) + { + numculled++; + continue; + } Con_Printf("%s\n", PRVM_GetString(prog->globaldefs[i].s_name)); - Con_Printf("%i global variables, totalling %i bytes\n", prog->progs->numglobals, prog->progs->numglobals * 4); + } + Con_Printf("%i global variables, %i culled, totalling %i bytes\n", prog->progs->numglobals, numculled, prog->progs->numglobals * 4); PRVM_End; } @@ -1663,7 +2000,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( global->type, (prvm_eval_t *) &prog->globals[ global->ofs ] ) ); + Con_Printf( "%s: %s\n", Cmd_Argv(2), PRVM_ValueString( (etype_t)global->type, (prvm_eval_t *) &prog->globals.generic[ global->ofs ] ) ); PRVM_End; } @@ -1699,18 +2036,27 @@ PRVM_Init */ void PRVM_Init (void) { - Cmd_AddCommand ("prvm_edict", PRVM_ED_PrintEdict_f); - Cmd_AddCommand ("prvm_edicts", PRVM_ED_PrintEdicts_f); - Cmd_AddCommand ("prvm_edictcount", PRVM_ED_Count_f); - Cmd_AddCommand ("prvm_profile", PRVM_Profile_f); - Cmd_AddCommand ("prvm_fields", PRVM_Fields_f); - Cmd_AddCommand ("prvm_globals", PRVM_Globals_f); - Cmd_AddCommand ("prvm_global", PRVM_Global_f); - Cmd_AddCommand ("prvm_globalset", PRVM_GlobalSet_f); - Cmd_AddCommand ("prvm_edictset", PRVM_ED_EdictSet_f); + Cmd_AddCommand ("prvm_edict", PRVM_ED_PrintEdict_f, "print all data about an entity number in the selected VM (server, client, menu)"); + 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_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_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_traceqc); + Cvar_RegisterVariable (&prvm_statementprofiling); + Cvar_RegisterVariable (&prvm_backtraceforwarnings); //VM_Cmd_Init(); } @@ -1723,7 +2069,7 @@ PRVM_InitProg void PRVM_InitProg(int prognr) { if(prognr < 0 || prognr >= PRVM_MAXPROGS) - Sys_Error("PRVM_InitProg: Invalid program number %i\n",prognr); + Sys_Error("PRVM_InitProg: Invalid program number %i",prognr); prog = &prog_list[prognr]; @@ -1731,8 +2077,9 @@ void PRVM_InitProg(int prognr) PRVM_ResetProg(); memset(prog, 0, sizeof(prvm_prog_t)); + prog->starttime = Sys_DoubleTime(); - prog->time = &prog->_time; + prog->error_cmd = Host_Error; } int PRVM_GetProgNr() @@ -1740,6 +2087,24 @@ int PRVM_GetProgNr() return prog - prog_list; } +void *_PRVM_Alloc(size_t buffersize, const char *filename, int fileline) +{ + return _Mem_Alloc(prog->progs_mempool, buffersize, filename, fileline); +} + +void _PRVM_Free(void *buffer, const char *filename, int fileline) +{ + _Mem_Free(buffer, filename, fileline); +} + +void _PRVM_FreeAll(const char *filename, int fileline) +{ + prog->progs = NULL; + prog->fielddefs = NULL; + prog->functions = NULL; + _Mem_EmptyPool(prog->progs_mempool, filename, fileline); +} + // LordHavoc: turned PRVM_EDICT_NUM into a #define for speed reasons prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline) { @@ -1747,50 +2112,250 @@ prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline) return NULL; } -void PRVM_ProcessError(void) -{ - if(prog) - PRVM_GCALL(error_cmd)(); -} - /* -int NUM_FOR_EDICT_ERROR(edict_t *e) +int NUM_FOR_EDICT_ERROR(prvm_edict_t *e) { - Host_Error ("NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, sv.edicts, e - sv.edicts); + 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 NUM_FOR_EDICT(edict_t *e) +int PRVM_NUM_FOR_EDICT(prvm_edict_t *e) { int n; - n = e - sv.edicts; - if ((unsigned int)n >= MAX_EDICTS) - Host_Error ("NUM_FOR_EDICT: bad pointer"); + 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(edict_t *e) +//int NoCrash_NUM_FOR_EDICT(prvm_edict_t *e) //{ -// return e - sv.edicts; +// return e - prog->edicts; //} -//#define EDICT_TO_PROG(e) ((qbyte *)(((edict_t *)e)->v) - (qbyte *)(sv.edictsfields)) -//#define PROG_TO_EDICT(e) (sv.edicts + ((e) / (progs->entityfields * 4))) -int EDICT_TO_PROG(edict_t *e) +//#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 - sv.edicts; - if ((unsigned int)n >= (unsigned int)sv.max_edicts) - Host_Error("EDICT_TO_PROG: invalid edict %8p (number %i compared to world at %8p)\n", e, n, sv.edicts); + 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 (qbyte *)e->v - (qbyte *)sv.edictsfields; + //return (unsigned char *)e->v - (unsigned char *)prog->edictsfields; } -edict_t *PROG_TO_EDICT(int n) +prvm_edict_t *PRVM_PROG_TO_EDICT(int n) { - if ((unsigned int)n >= (unsigned int)sv.max_edicts) - Host_Error("PROG_TO_EDICT: invalid edict number %i\n", n); - return sv.edicts + n; // EXPERIMENTAL - //return sv.edicts + ((n) / (progs->entityfields * 4)); + 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; + +const char *PRVM_GetString(int num) +{ + 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 ""; + } + } + else +#endif + { + VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize); + return ""; + } + } + else + { + num = -1 - num; +#if 0 + if (num >= (1<<30)) + { + // special range reserved for tempstrings + num -= (1<<30); + 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 ""; + } + } + 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 + { + VM_Warning("PRVM_GetString: Invalid zone-string offset (%i >= %i)\n", num, prog->numknownstrings); + return ""; + } + } +} + +int PRVM_SetEngineString(const char *s) +{ + int i; + if (!s) + return 0; + if (s >= prog->strings && s <= prog->strings + prog->stringssize) + PRVM_ERROR("PRVM_SetEngineString: s in prog->strings area"); + // if it's in the tempstrings area, use a reserved range + // (otherwise we'd get millions of useless string offsets cluttering the database) + 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; + // new unknown engine string + if (developer.integer >= 200) + Con_Printf("new engine string %p = \"%s\"\n", s, s); + for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++) + if (!prog->knownstrings[i]) + break; + if (i >= prog->numknownstrings) + { + if (i >= prog->maxknownstrings) + { + const char **oldstrings = prog->knownstrings; + const unsigned char *oldstrings_freeable = prog->knownstrings_freeable; + prog->maxknownstrings += 128; + prog->knownstrings = (const char **)PRVM_Alloc(prog->maxknownstrings * sizeof(char *)); + prog->knownstrings_freeable = (unsigned char *)PRVM_Alloc(prog->maxknownstrings * sizeof(unsigned char)); + if (prog->numknownstrings) + { + memcpy((char **)prog->knownstrings, oldstrings, prog->numknownstrings * sizeof(char *)); + memcpy((char **)prog->knownstrings_freeable, oldstrings_freeable, prog->numknownstrings * sizeof(unsigned char)); + } + } + prog->numknownstrings++; + } + prog->firstfreeknownstring = i + 1; + prog->knownstrings[i] = s; + return -1 - i; +} + +// temp string handling + +// all tempstrings go into this buffer consecutively, and it is reset +// whenever PRVM_ExecuteProgram returns to the engine +// (technically each PRVM_ExecuteProgram call saves the cursize value and +// restores it on return, so multiple recursive calls can share the same +// buffer) +// the buffer size is automatically grown as needed + +int PRVM_SetTempString(const char *s) +{ + int size; + char *t; + 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 (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size) + { + sizebuf_t old = vm_tempstringsbuf; + if (vm_tempstringsbuf.cursize + size >= 1<<28) + PRVM_ERROR("PRVM_SetTempString: ran out of tempstring memory! (refusing to grow tempstring buffer over 256MB, cursize %i, size %i)\n", vm_tempstringsbuf.cursize, size); + vm_tempstringsbuf.maxsize = max(vm_tempstringsbuf.maxsize, 65536); + while (vm_tempstringsbuf.maxsize < vm_tempstringsbuf.cursize + size) + 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); + if (old.cursize) + memcpy(vm_tempstringsbuf.data, old.data, old.cursize); + if (old.data) + Mem_Free(old.data); + } + } + t = (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.cursize; + memcpy(t, s, size); + vm_tempstringsbuf.cursize += size; + return PRVM_SetEngineString(t); +} + +int PRVM_AllocString(size_t bufferlength, char **pointer) +{ + int i; + if (!bufferlength) + return 0; + for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++) + if (!prog->knownstrings[i]) + break; + if (i >= prog->numknownstrings) + { + if (i >= prog->maxknownstrings) + { + const char **oldstrings = prog->knownstrings; + const unsigned char *oldstrings_freeable = prog->knownstrings_freeable; + prog->maxknownstrings += 128; + prog->knownstrings = (const char **)PRVM_Alloc(prog->maxknownstrings * sizeof(char *)); + prog->knownstrings_freeable = (unsigned char *)PRVM_Alloc(prog->maxknownstrings * sizeof(unsigned char)); + if (prog->numknownstrings) + { + memcpy((char **)prog->knownstrings, oldstrings, prog->numknownstrings * sizeof(char *)); + memcpy((char **)prog->knownstrings_freeable, oldstrings_freeable, prog->numknownstrings * sizeof(unsigned char)); + } + } + prog->numknownstrings++; + } + prog->firstfreeknownstring = i + 1; + prog->knownstrings[i] = (char *)PRVM_Alloc(bufferlength); + prog->knownstrings_freeable[i] = true; + if (pointer) + *pointer = (char *)(prog->knownstrings[i]); + return -1 - i; +} + +void PRVM_FreeString(int num) +{ + if (num == 0) + 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) + { + num = -1 - num; + if (!prog->knownstrings[num]) + PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string"); + if (!prog->knownstrings[num]) + PRVM_ERROR("PRVM_FreeString: attempt to free a string owned by the engine"); + PRVM_Free((char *)prog->knownstrings[num]); + prog->knownstrings[num] = NULL; + prog->knownstrings_freeable[num] = false; + prog->firstfreeknownstring = min(prog->firstfreeknownstring, num); + } + else + PRVM_ERROR("PRVM_FreeString: invalid string offset %i", num); +} +