X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=prvm_edict.c;h=68f5197aed5ad57c79c72ec0fa87f84acb6d6030;hb=6162f7035eef9d1dc6a4913dba2e2023c0857c3a;hp=29ee0c1cdaf9e1d29255e315837d0954e71462a3;hpb=a953951712448641f8f9263add258b6a0fa58dbc;p=xonotic%2Fdarkplaces.git

diff --git a/prvm_edict.c b/prvm_edict.c
index 29ee0c1c..68f5197a 100644
--- a/prvm_edict.c
+++ b/prvm_edict.c
@@ -32,9 +32,11 @@ 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"};
+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)"};
 // 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)"};
 
 //============================================================================
 // mempool handling
@@ -57,7 +59,7 @@ void PRVM_MEM_Alloc(void)
 	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);
@@ -68,8 +70,8 @@ void PRVM_MEM_Alloc(void)
 	// set edict pointers
 	for(i = 0; i < prog->max_edicts; i++)
 	{
-		prog->edicts[i].priv.required = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
-		prog->edicts[i].fields.vp = (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);
 	}
 }
 
@@ -102,8 +104,8 @@ void PRVM_MEM_IncreaseEdicts(void)
 	//set e and v pointers
 	for(i = 0; i < prog->max_edicts; i++)
 	{
-		prog->edicts[i].priv.required  = (prvm_edict_private_t *)((qbyte  *)prog->edictprivate + i * prog->edictprivate_size);
-		prog->edicts[i].fields.vp = (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)();
@@ -124,6 +126,16 @@ int PRVM_ED_FindFieldOffset(const char *field)
 	return d->ofs*4;
 }
 
+ddef_t*	PRVM_ED_FindGlobal(const char *name);
+int PRVM_ED_FindGlobalOffset(const char *global)
+{
+	ddef_t *d;
+	d = PRVM_ED_FindGlobal(global);
+	if (!d)
+		return 0;
+	return d->ofs*4;
+}
+
 qboolean PRVM_ProgLoaded(int prognr)
 {
 	if(prognr < 0 || prognr >= PRVM_MAXPROGS)
@@ -172,10 +184,10 @@ void PRVM_SetProg(int prognr)
 		if(prog_list[prognr].loaded)
 			prog = &prog_list[prognr];
 		else
-			PRVM_ERROR("%i not loaded !\n", prognr);
+			PRVM_ERROR("%i not loaded !", prognr);
 		return;
 	}
-	PRVM_ERROR("Invalid program number %i\n", prognr);
+	PRVM_ERROR("Invalid program number %i", prognr);
 }
 
 /*
@@ -368,12 +380,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)
 	{
@@ -427,13 +439,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;
 	const char *s;
 	ddef_t *def;
 	mfunction_t *f;
 
-	type &= ~DEF_SAVEGLOBAL;
+	type = (etype_t)((int)type & ~DEF_SAVEGLOBAL);
 
 	switch (type)
 	{
@@ -499,7 +511,7 @@ 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];
@@ -507,37 +519,37 @@ char *PRVM_GlobalString (int 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;
 }
@@ -554,13 +566,13 @@ For debugging
 // 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)
 {
-	int		l;
+	size_t	l;
 	ddef_t	*d;
 	int		*v;
 	int		i, j;
 	const char	*name;
 	int		type;
-	char	tempstring[8192], tempstring2[260]; // temporary string buffers
+	char	tempstring[MAX_INPUTLINE], tempstring2[260]; // temporary string buffers
 
 	if (ed->priv.required->free)
 	{
@@ -588,11 +600,11 @@ 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);
@@ -600,17 +612,17 @@ void PRVM_ED_Print(prvm_edict_t *ed)
 			strcat(tempstring, " ");
 		strcat(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)
+		if (strlen(tempstring) >= sizeof(tempstring)/2)
 		{
 			Con_Print(tempstring);
 			tempstring[0] = 0;
@@ -661,7 +673,7 @@ 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");
@@ -813,7 +825,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.generic[def->ofs]));
+		FS_Printf(f,"\"%s\"\n", PRVM_UglyValueString((etype_t)type, (prvm_eval_t *)&prog->globals.generic[def->ofs]));
 	}
 	FS_Print(f,"}\n");
 }
@@ -825,14 +837,14 @@ 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");
+			PRVM_ERROR ("PRVM_ED_ParseGlobals: EOF without closing brace");
 		if (com_token[0] == '}')
 			break;
 
@@ -840,10 +852,10 @@ void PRVM_ED_ParseGlobals (const char *data)
 
 		// parse value
 		if (!COM_ParseToken(&data, false))
-			PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+			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)
@@ -883,7 +895,7 @@ qboolean PRVM_ED_ParseEpair(prvm_edict_t *ent, ddef_t *key, const char *s)
 	switch (key->type & ~DEF_SAVEGLOBAL)
 	{
 	case ev_string:
-		l = strlen(s) + 1;
+		l = (int)strlen(s) + 1;
 		val->string = PRVM_AllocString(l, &new_p);
 		for (i = 0;i < l;i++)
 		{
@@ -927,15 +939,15 @@ 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 >= prog->limit_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 (ent)
 			val = (prvm_eval_t *)((int *)ent->fields.vp + key->ofs);
-		val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(i));
+		val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM((int)i));
 		break;
 
 	case ev_field:
@@ -1009,13 +1021,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;
 
@@ -1024,7 +1037,9 @@ const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent)
 	{
 	// parse key
 		if (!COM_ParseToken(&data, false))
-			PRVM_ERROR ("PRVM_ED_ParseEntity: EOF without closing brace");
+			PRVM_ERROR ("PRVM_ED_ParseEdict: EOF without closing brace");
+		if (developer_entityparsing.integer)
+			Con_Printf("Key: \"%s\"", com_token);
 		if (com_token[0] == '}')
 			break;
 
@@ -1054,13 +1069,19 @@ 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");
+			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] == '_')
@@ -1156,7 +1177,7 @@ void PRVM_ED_LoadFromFile (const char *data)
 //
 		if(prog->self && prog->flag & PRVM_FE_CLASSNAME)
 		{
-			string_t handle =  *(string_t*)&((qbyte*)ent->fields.vp)[PRVM_ED_FindFieldOffset("classname")];
+			string_t handle =  *(string_t*)&((unsigned char*)ent->fields.vp)[PRVM_ED_FindFieldOffset("classname")];
 			if (!handle)
 			{
 				Con_Print("No classname for:\n");
@@ -1221,6 +1242,53 @@ void PRVM_ResetProg()
 	memset(prog,0,sizeof(prvm_prog_t));
 }
 
+/*
+===============
+PRVM_LoadLNO
+===============
+*/
+void PRVM_LoadLNO( const char *progname ) {
+	fs_offset_t filesize;
+	unsigned char *lno;
+	unsigned int *header;
+	char filename[512];
+
+	FS_StripExtension( progname, filename, sizeof( filename ) );
+	strlcat( filename, ".lno", sizeof( filename ) );
+
+	lno = FS_LoadFile( filename, tempmempool, false, &filesize );
+	if( !lno ) {
+		return;
+	}
+
+/*
+<Spike>    SafeWrite (h, &lnotype, sizeof(int));
+<Spike>    SafeWrite (h, &version, sizeof(int));
+<Spike>    SafeWrite (h, &numglobaldefs, sizeof(int));
+<Spike>    SafeWrite (h, &numpr_globals, sizeof(int));
+<Spike>    SafeWrite (h, &numfielddefs, sizeof(int));
+<Spike>    SafeWrite (h, &numstatements, sizeof(int));
+<Spike>    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 );
+}
+
 /*
 ===============
 PRVM_LoadProgs
@@ -1232,18 +1300,19 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
 	dstatement_t *st;
 	ddef_t *infielddefs;
 	dfunction_t *dfunctions;
+	fs_offset_t filesize;
 
 	if( prog->loaded ) {
-		PRVM_ERROR ("PRVM_LoadProgs: there is already a %s program loaded!\n", PRVM_NAME );
+		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, filesize/1024);
 
-	prog->filecrc = 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++)
@@ -1254,35 +1323,38 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
 	if (prog->progs->crc != prog->headercrc)
 		PRVM_ERROR ("%s: %s system vars have been modified, progdefs.h is out of date", PRVM_NAME, filename);
 
-	//prog->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);
 
 	prog->strings = (char *)prog->progs + prog->progs->ofs_strings;
 	prog->stringssize = 0;
 	for (i = 0;i < prog->progs->numstrings;i++)
 	{
-		if (prog->progs->ofs_strings + prog->stringssize >= fs_filesize)
-			PRVM_ERROR ("%s: %s strings go past end of file\n", PRVM_NAME, filename);
-		prog->stringssize += strlen (prog->strings + prog->stringssize) + 1;
+		if (prog->progs->ofs_strings + prog->stringssize >= (int)filesize)
+			PRVM_ERROR ("%s: %s strings go past end of file", PRVM_NAME, filename);
+		prog->stringssize += (int)strlen (prog->strings + prog->stringssize) + 1;
 	}
 	prog->numknownstrings = 0;
 	prog->maxknownstrings = 0;
 	prog->knownstrings = NULL;
+	prog->knownstrings_freeable = NULL;
 
-	prog->globaldefs = (ddef_t *)((qbyte *)prog->progs + prog->progs->ofs_globaldefs);
+	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 + numrequiredfields) * 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.generic = (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 ; i<prog->progs->numstatements ; i++)
@@ -1293,7 +1365,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);
@@ -1338,7 +1410,7 @@ void PRVM_LoadProgs (const char * filename, int numrequiredfunc, char **required
 	// 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);
 
 	for (i=0 ; i<prog->progs->numglobals ; i++)
 		((int *)prog->globals.generic)[i] = LittleLong (((int *)prog->globals.generic)[i]);
@@ -1356,11 +1428,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:
@@ -1398,7 +1470,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:
@@ -1407,7 +1479,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:
@@ -1424,7 +1496,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:
@@ -1439,14 +1511,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;
@@ -1481,7 +1555,7 @@ void PRVM_Fields_f (void)
 {
 	int i, j, ednum, used, usedamount;
 	int *counts;
-	char tempstring[5000], tempstring2[260];
+	char tempstring[MAX_INPUTLINE], tempstring2[260];
 	const char *name;
 	prvm_edict_t *ed;
 	ddef_t *d;
@@ -1506,7 +1580,7 @@ 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);
@@ -1570,20 +1644,20 @@ void PRVM_Fields_f (void)
 			strcat(tempstring, tempstring2);
 			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++)
+		for (j = (int)strlen(name);j < 25;j++)
 			strcat(tempstring, " ");
 		sprintf(tempstring2, "%5d", counts[i]);
 		strcat(tempstring, tempstring2);
 		strcat(tempstring, "\n");
-		if (strlen(tempstring) >= 4096)
+		if (strlen(tempstring) >= sizeof(tempstring)/2)
 		{
 			Con_Print(tempstring);
 			tempstring[0] = 0;
@@ -1649,7 +1723,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.generic[ 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;
 }
 
@@ -1685,18 +1759,20 @@ 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, "set a property on an entity number 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_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)");
 	// 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_RegisterVariable (&prvm_boundscheck);
 	Cvar_RegisterVariable (&prvm_traceqc);
+	Cvar_RegisterVariable (&prvm_statementprofiling);
 
 	//VM_Cmd_Init();
 }
@@ -1709,7 +1785,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];
 
@@ -1755,7 +1831,7 @@ prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline)
 /*
 int NUM_FOR_EDICT_ERROR(prvm_edict_t *e)
 {
-	Host_Error ("PRVM_NUM_FOR_EDICT: bad pointer %p (world is %p, entity number would be %i)", e, prog->edicts, e - prog->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;
 }
 
@@ -1773,21 +1849,21 @@ int PRVM_NUM_FOR_EDICT(prvm_edict_t *e)
 //	return e - prog->edicts;
 //}
 
-//#define	PRVM_EDICT_TO_PROG(e) ((qbyte *)(((prvm_edict_t *)e)->v) - (qbyte *)(prog->edictsfields))
+//#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)\n", e, n, prog->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 *)prog->edictsfields;
+	//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", n);
+		Host_Error("PRVM_PROG_TO_EDICT: invalid edict number %i", n);
 	return prog->edicts + n; // EXPERIMENTAL
 	//return prog->edicts + ((n) / (progs->entityfields * 4));
 }
@@ -1802,12 +1878,12 @@ const char *PRVM_GetString(int num)
 	{
 		num = -1 - num;
 		if (!prog->knownstrings[num])
-			Host_Error("PRVM_GetString: attempt to get string that is already freed\n");
+			PRVM_ERROR("PRVM_GetString: attempt to get string that is already freed");
 		return prog->knownstrings[num];
 	}
 	else
 	{
-		Host_Error("PRVM_GetString: invalid string offset %i\n", num);
+		PRVM_ERROR("PRVM_GetString: invalid string offset %i", num);
 		return "";
 	}
 }
@@ -1818,12 +1894,12 @@ int PRVM_SetEngineString(const char *s)
 	if (!s)
 		return 0;
 	if (s >= prog->strings && s <= prog->strings + prog->stringssize)
-		Host_Error("PRVM_SetEngineString: s in prog->strings area\n");
+		PRVM_ERROR("PRVM_SetEngineString: s in prog->strings area");
 	for (i = 0;i < prog->numknownstrings;i++)
 		if (prog->knownstrings[i] == s)
 			return -1 - i;
 	// new unknown engine string
-	if (developer.integer >= 3)
+	if (developer.integer >= 100)
 		Con_Printf("new engine string %p\n", s);
 	for (i = prog->firstfreeknownstring;i < prog->numknownstrings;i++)
 		if (!prog->knownstrings[i])
@@ -1833,10 +1909,15 @@ int PRVM_SetEngineString(const char *s)
 		if (i >= prog->maxknownstrings)
 		{
 			const char **oldstrings = prog->knownstrings;
+			const unsigned char *oldstrings_freeable = prog->knownstrings_freeable;
 			prog->maxknownstrings += 128;
-			prog->knownstrings = PRVM_Alloc(prog->maxknownstrings * sizeof(char *));
+			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++;
 	}
@@ -1845,7 +1926,7 @@ int PRVM_SetEngineString(const char *s)
 	return -1 - i;
 }
 
-int PRVM_AllocString(int bufferlength, char **pointer)
+int PRVM_AllocString(size_t bufferlength, char **pointer)
 {
 	int i;
 	if (!bufferlength)
@@ -1858,15 +1939,21 @@ int PRVM_AllocString(int bufferlength, char **pointer)
 		if (i >= prog->maxknownstrings)
 		{
 			const char **oldstrings = prog->knownstrings;
+			const unsigned char *oldstrings_freeable = prog->knownstrings_freeable;
 			prog->maxknownstrings += 128;
-			prog->knownstrings = PRVM_Alloc(prog->maxknownstrings * sizeof(char *));
+			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] = PRVM_Alloc(bufferlength);
+	prog->knownstrings[i] = (char *)PRVM_Alloc(bufferlength);
+	prog->knownstrings_freeable[i] = true;
 	if (pointer)
 		*pointer = (char *)(prog->knownstrings[i]);
 	return -1 - i;
@@ -1875,19 +1962,22 @@ int PRVM_AllocString(int bufferlength, char **pointer)
 void PRVM_FreeString(int num)
 {
 	if (num == 0)
-		Host_Error("PRVM_FreeString: attempt to free a NULL string\n");
+		PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string");
 	else if (num >= 0 && num < prog->stringssize)
-		Host_Error("PRVM_FreeString: attempt to free a constant string\n");
+		PRVM_ERROR("PRVM_FreeString: attempt to free a constant string");
 	else if (num < 0 && num >= -prog->numknownstrings)
 	{
 		num = -1 - num;
 		if (!prog->knownstrings[num])
-			Host_Error("PRVM_FreeString: attempt to free a non-existent or already freed string\n");
+			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
-		Host_Error("PRVM_FreeString: invalid string offset %i\n", num);
+		PRVM_ERROR("PRVM_FreeString: invalid string offset %i", num);
 }