cvar_t prvm_traceqc = {0, "prvm_traceqc", "0", "prints every QuakeC statement as it is executed (only for really thorough debugging!)"};
// LordHavoc: counts usage of each QuakeC statement
cvar_t prvm_statementprofiling = {0, "prvm_statementprofiling", "0", "counts how many times each QuakeC statement has been executed, these counts are displayed in prvm_printfunction output (if enabled)"};
+cvar_t prvm_timeprofiling = {0, "prvm_timeprofiling", "0", "counts how long each function has been executed, these counts are displayed in prvm_profile output (if enabled)"};
cvar_t prvm_backtraceforwarnings = {0, "prvm_backtraceforwarnings", "0", "print a backtrace for warnings too"};
cvar_t prvm_leaktest = {0, "prvm_leaktest", "0", "try to detect memory leaks in strings or entities"};
cvar_t prvm_leaktest_ignore_classnames = {0, "prvm_leaktest_ignore_classnames", "", "classnames of entities to NOT leak check because they are found by find(world, classname, ...) but are actually spawned by QC code (NOT map entities)"};
static double prvm_reuseedicts_always_allow = 0;
qboolean prvm_runawaycheck = true;
-// LordHavoc: optional runtime bounds checking (speed drain, but worth it for security, on by default - breaks most QCCX features (used by CRMod and others))
-// 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)
-qboolean prvm_boundscheck = true;
-
extern sizebuf_t vm_tempstringsbuf;
//============================================================================
dpsnprintf (line, sizeof (line), "void");
break;
case ev_float:
- dpsnprintf (line, sizeof (line), "%f", val->_float);
+ dpsnprintf (line, sizeof (line), "%.9g", val->_float);
break;
case ev_vector:
- dpsnprintf (line, sizeof (line), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]);
+ dpsnprintf (line, sizeof (line), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]);
break;
default:
dpsnprintf (line, sizeof (line), "bad type %i", type);
}
v = (prvm_eval_t *)(ed->fields.vp + key->ofs);
- s = PRVM_UglyValueString(key->type, v);
+ s = PRVM_UglyValueString((etype_t)key->type, v);
if(Cmd_Argc() == 5)
{
cvar_t *cvar = Cvar_FindVar(Cmd_Argv(4));
}
v = (prvm_eval_t *) &prog->globals.generic[key->ofs];
- s = PRVM_UglyValueString(key->type, v);
+ s = PRVM_UglyValueString((etype_t)key->type, v);
if(Cmd_Argc() == 4)
{
cvar_t *cvar = Cvar_FindVar(Cmd_Argv(3));
}
else
{
- if (developer.integer) // don't confuse non-developers with errors
+ if (developer.integer > 0) // don't confuse non-developers with errors
{
Con_Print("No spawn function for:\n");
PRVM_ED_Print(ent, NULL);
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.discardabledemo = PRVM_ED_FindFieldOffset("discardabledemo");
prog->fieldoffsets.dphitcontentsmask = PRVM_ED_FindFieldOffset("dphitcontentsmask");
prog->fieldoffsets.drawonlytoclient = PRVM_ED_FindFieldOffset("drawonlytoclient");
prog->fieldoffsets.exteriormodeltoclient = PRVM_ED_FindFieldOffset("exteriormodeltoclient");
prog->fieldoffsets.jointtype = PRVM_ED_FindFieldOffset("jointtype");
prog->fieldoffsets.movedir = PRVM_ED_FindFieldOffset("movedir");
+ prog->fieldoffsets.camera_transform = PRVM_ED_FindFieldOffset("camera_transform");
+ prog->fieldoffsets.userwavefunc_param0 = PRVM_ED_FindFieldOffset("userwavefunc_param0");
+ prog->fieldoffsets.userwavefunc_param1 = PRVM_ED_FindFieldOffset("userwavefunc_param1");
+ prog->fieldoffsets.userwavefunc_param2 = PRVM_ED_FindFieldOffset("userwavefunc_param2");
+ prog->fieldoffsets.userwavefunc_param3 = PRVM_ED_FindFieldOffset("userwavefunc_param3");
+
prog->funcoffsets.CSQC_ConsoleCommand = PRVM_ED_FindFunctionOffset("CSQC_ConsoleCommand");
prog->funcoffsets.CSQC_Ent_Remove = PRVM_ED_FindFunctionOffset("CSQC_Ent_Remove");
prog->funcoffsets.CSQC_Ent_Spawn = PRVM_ED_FindFunctionOffset("CSQC_Ent_Spawn");
prog->globaloffsets.v_up = PRVM_ED_FindGlobalOffset("v_up");
prog->globaloffsets.view_angles = PRVM_ED_FindGlobalOffset("view_angles");
prog->globaloffsets.worldstatus = PRVM_ED_FindGlobalOffset("worldstatus");
+ prog->globaloffsets.particles_alphamin = PRVM_ED_FindGlobalOffset("particles_alphamin");
+ prog->globaloffsets.particles_alphamax = PRVM_ED_FindGlobalOffset("particles_alphamax");
+ prog->globaloffsets.particles_colormin = PRVM_ED_FindGlobalOffset("particles_colormin");
+ prog->globaloffsets.particles_colormax = PRVM_ED_FindGlobalOffset("particles_colormax");
// menu qc only uses some functions, nothing else
prog->funcoffsets.m_draw = PRVM_ED_FindFunctionOffset("m_draw");
if(!buf)
return NULL;
- po = Mem_Alloc(pool, sizeof(*po));
+ memset(&thisstr, 0, sizeof(thisstr)); // hush compiler warning
+
+ po = (po_t *)Mem_Alloc(pool, sizeof(*po));
memset(po, 0, sizeof(*po));
p = buf;
{
if(thisstr.key)
Mem_Free(thisstr.key);
- thisstr.key = Mem_Alloc(pool, decodedpos + 1);
+ thisstr.key = (char *)Mem_Alloc(pool, decodedpos + 1);
memcpy(thisstr.key, decodedbuf, decodedpos + 1);
}
else if(decodedpos > 0 && thisstr.key) // skip empty translation results
{
- thisstr.value = Mem_Alloc(pool, decodedpos + 1);
+ thisstr.value = (char *)Mem_Alloc(pool, decodedpos + 1);
memcpy(thisstr.value, decodedbuf, decodedpos + 1);
hashindex = CRC_Block((const unsigned char *) thisstr.key, strlen(thisstr.key)) % PO_HASHSIZE;
thisstr.nextonhashchain = po->hashtable[hashindex];
- po->hashtable[hashindex] = Mem_Alloc(pool, sizeof(thisstr));
+ po->hashtable[hashindex] = (po_string_t *)Mem_Alloc(pool, sizeof(thisstr));
memcpy(po->hashtable[hashindex], &thisstr, sizeof(thisstr));
memset(&thisstr, 0, sizeof(thisstr));
}
// later idea: include a list of authorized .po file checksums with the csprogs
{
qboolean deftrans = !!strcmp(PRVM_NAME, "client");
+ if(deftrans) // once we have dotranslate_ strings, ALWAYS use the opt-in method!
+ {
+ for (i=0 ; i<prog->progs->numglobaldefs ; i++)
+ {
+ const char *name;
+ name = PRVM_GetString(prog->globaldefs[i].s_name);
+ if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ if(name && !strncmp(name, "dotranslate_", 12))
+ {
+ deftrans = false;
+ break;
+ }
+ }
+ }
if(!strcmp(prvm_language.string, "dump"))
{
qfile_t *f = FS_OpenRealFile(va("%s.%s.po", filename, prvm_language.string), "w", false);
{
const char *name;
name = PRVM_GetString(prog->globaldefs[i].s_name);
- if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12)))
if((prog->globaldefs[i].type & ~DEF_SAVEGLOBAL) == ev_string)
+ if(deftrans ? (!name || strncmp(name, "notranslate_", 12)) : (name && !strncmp(name, "dotranslate_", 12)))
{
prvm_eval_t *val = (prvm_eval_t *)(prog->globals.generic + prog->globaldefs[i].ofs);
const char *value = PRVM_GetString(val->string);
if((float)((int)(val->_float)) == val->_float)
dpsnprintf(buf, sizeof(buf), "%i", (int)(val->_float));
else
- dpsnprintf(buf, sizeof(buf), "%f", val->_float);
+ dpsnprintf(buf, sizeof(buf), "%.9g", val->_float);
value = buf;
break;
case ev_vector:
- dpsnprintf(buf, sizeof(buf), "%f %f %f", val->vector[0], val->vector[1], val->vector[2]); value = buf;
+ dpsnprintf(buf, sizeof(buf), "%.9g %.9g %.9g", val->vector[0], val->vector[1], val->vector[2]); value = buf;
break;
case ev_string:
value = PRVM_GetString(val->string);
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");
- // COMMANDLINEOPTION: PRVM: -noboundscheck disables the bounds checks (security hole if CSQC is in use!)
- prvm_boundscheck = !COM_CheckParm("-noboundscheck");
-
Cvar_RegisterVariable (&prvm_language);
Cvar_RegisterVariable (&prvm_traceqc);
Cvar_RegisterVariable (&prvm_statementprofiling);
+ Cvar_RegisterVariable (&prvm_timeprofiling);
Cvar_RegisterVariable (&prvm_backtraceforwarnings);
Cvar_RegisterVariable (&prvm_leaktest);
Cvar_RegisterVariable (&prvm_leaktest_ignore_classnames);
}
sizebuf_t vm_tempstringsbuf;
+#define PRVM_KNOWNSTRINGBASE 0x40000000
const char *PRVM_GetString(int num)
{
- if (num >= 0)
+ if (num < 0)
{
- if (num < prog->stringssize)
- return prog->strings + num;
- else
-#if 1
- if (num <= prog->stringssize + vm_tempstringsbuf.maxsize)
- {
- num -= prog->stringssize;
- if (num < vm_tempstringsbuf.cursize)
- return (char *)vm_tempstringsbuf.data + num;
- else
- {
- VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
- return "";
- }
- }
+ // invalid
+ VM_Warning("PRVM_GetString: Invalid string offset (%i < 0)\n", num);
+ return "";
+ }
+ else if (num < prog->stringssize)
+ {
+ // constant string from progs.dat
+ return prog->strings + num;
+ }
+ else if (num <= prog->stringssize + vm_tempstringsbuf.maxsize)
+ {
+ // tempstring returned by engine to QC (becomes invalid after returning to engine)
+ num -= prog->stringssize;
+ if (num < vm_tempstringsbuf.cursize)
+ return (char *)vm_tempstringsbuf.data + num;
else
-#endif
{
- VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ VM_Warning("PRVM_GetString: Invalid temp-string offset (%i >= %i vm_tempstringsbuf.cursize)\n", num, vm_tempstringsbuf.cursize);
return "";
}
}
- else
+ else if (num & PRVM_KNOWNSTRINGBASE)
{
- num = -1 - num;
-#if 0
- if (num >= (1<<30))
- {
- // 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)
+ // allocated string
+ num = num - PRVM_KNOWNSTRINGBASE;
+ if (num >= 0 && num < prog->numknownstrings)
{
if (!prog->knownstrings[num])
{
return "";
}
}
+ else
+ {
+ // invalid string offset
+ VM_Warning("PRVM_GetString: Invalid constant-string offset (%i >= %i prog->stringssize)\n", num, prog->stringssize);
+ return "";
+ }
}
const char *PRVM_ChangeEngineString(int i, const char *s)
{
const char *old;
- i = -1 - i;
+ i = i - PRVM_KNOWNSTRINGBASE;
if(i < 0 || i >= prog->numknownstrings)
PRVM_ERROR("PRVM_ChangeEngineString: s is not an engine string");
old = prog->knownstrings[i];
if (s >= (char *)vm_tempstringsbuf.data && s < (char *)vm_tempstringsbuf.data + vm_tempstringsbuf.maxsize)
#if 1
return prog->stringssize + (s - (char *)vm_tempstringsbuf.data);
-#else
- return -1 - ((1<<30) + (s - (char *)vm_tempstringsbuf.data));
#endif
// see if it's a known string address
for (i = 0;i < prog->numknownstrings;i++)
if (prog->knownstrings[i] == s)
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
// new unknown engine string
if (developer_insane.integer)
Con_DPrintf("new engine string %p = \"%s\"\n", s, s);
prog->knownstrings_freeable[i] = false;
if(prog->leaktest_active)
prog->knownstrings_origin[i] = NULL;
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
// temp string handling
if(prog->leaktest_active)
memcpy((char **)prog->knownstrings_origin, oldstrings_origin, prog->numknownstrings * sizeof(char *));
}
- // TODO why not Mem_Free the old ones?
+ if (oldstrings)
+ Mem_Free((char **)oldstrings);
+ if (oldstrings_freeable)
+ Mem_Free((unsigned char *)oldstrings_freeable);
+ if (oldstrings_origin)
+ Mem_Free((char **)oldstrings_origin);
}
prog->numknownstrings++;
}
prog->knownstrings_origin[i] = PRVM_AllocationOrigin();
if (pointer)
*pointer = (char *)(prog->knownstrings[i]);
- return -1 - i;
+ return PRVM_KNOWNSTRINGBASE + i;
}
void PRVM_FreeString(int num)
PRVM_ERROR("PRVM_FreeString: attempt to free a NULL string");
else if (num >= 0 && num < prog->stringssize)
PRVM_ERROR("PRVM_FreeString: attempt to free a constant string");
- else if (num < 0 && num >= -prog->numknownstrings)
+ else if (num >= PRVM_KNOWNSTRINGBASE && num < PRVM_KNOWNSTRINGBASE + prog->numknownstrings)
{
- num = -1 - num;
+ num = num - PRVM_KNOWNSTRINGBASE;
if (!prog->knownstrings[num])
PRVM_ERROR("PRVM_FreeString: attempt to free a non-existent or already freed string");
if (!prog->knownstrings_freeable[num])
projects / xonotic / darkplaces.git / blobdiff