X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progsvm.h;h=72cfa0bf13dabfc7defb5a7ee3b1c17a7d7c4aef;hb=9d617408dca6e2681de35a4b0ee6c324c2d60826;hp=9d50da706ee6a22b01d943321ea1c01b34f3fa77;hpb=4a43a0a0d3f92f90bfcbed68146a8a18dbb0818d;p=xonotic%2Fdarkplaces.git diff --git a/progsvm.h b/progsvm.h index 9d50da70..72cfa0bf 100644 --- a/progsvm.h +++ b/progsvm.h @@ -33,10 +33,15 @@ The code uses void pointers instead. #include "progdefs.h" // generated by program cdefs #include "clprogdefs.h" // generated by program cdefs +// forward declaration of clgecko_t +struct clgecko_s; + typedef struct prvm_stack_s { int s; mfunction_t *f; + double profile_acc; + double builtinsprofile_acc; } prvm_stack_t; @@ -64,6 +69,8 @@ typedef struct prvm_edict_private_s { qboolean free; float freetime; + int mark; + const char *allocation_origin; } prvm_edict_private_t; typedef struct prvm_edict_s @@ -114,6 +121,7 @@ typedef struct prvm_edict_s #define PRVM_MAX_OPENFILES 256 #define PRVM_MAX_OPENSEARCHES 128 +#define PRVM_MAX_GECKOINSTANCES 32 typedef void (*prvm_builtin_t) (void); @@ -122,7 +130,8 @@ typedef struct prvm_prog_fieldoffsets_s { // server and client use a lot of similar fields, so this is combined int SendEntity; // ssqc - int Version; // ssqc + int SendFlags; // ssqc + int Version; // ssqc (legacy) int alpha; // ssqc / csqc int ammo_cells1; // ssqc - Dissolution of Eternity mission pack int ammo_lava_nails; // ssqc - Dissolution of Eternity mission pack @@ -150,7 +159,9 @@ typedef struct prvm_prog_fieldoffsets_s int buttonuse; // ssqc int chain; // common - used by find builtins int classname; // common + int clientcamera; // ssqc int clientcolors; // ssqc + int clientstatus; // ssqc int color; // ssqc int colormod; // ssqc / csqc int contentstransition; // ssqc @@ -172,24 +183,32 @@ typedef struct prvm_prog_fieldoffsets_s int frame1time; // csqc int frame2; // csqc int frame2time; // csqc + int frame3; // csqc + int frame3time; // csqc + int frame4; // csqc + int frame4time; // csqc int frame; // common - used by OP_STATE int fullbright; // ssqc - Nehahra support int glow_color; // ssqc int glow_size; // ssqc int glow_trail; // ssqc + int glowmod; // ssqc / csqc int gravity; // ssqc int groundentity; // ssqc / csqc int hull; // ssqc / csqc int ideal_yaw; // ssqc / csqc int idealpitch; // ssqc / csqc int items2; // ssqc + int lerpfrac3; // csqc + int lerpfrac4; // csqc int lerpfrac; // csqc int light_lev; // ssqc int message; // csqc int modelflags; // ssqc int movement; // ssqc - int nextthink; // common - used by OP_STATE + int movetypesteplandevent; // ssqc int netaddress; // ssqc + int nextthink; // common - used by OP_STATE int nodrawtoclient; // ssqc int pflags; // ssqc int ping; // ssqc @@ -202,6 +221,7 @@ typedef struct prvm_prog_fieldoffsets_s int renderflags; // csqc int rendermode; // ssqc - HalfLife support int scale; // ssqc / csqc + int shadertime; // csqc int style; // ssqc int tag_entity; // ssqc / csqc int tag_index; // ssqc / csqc @@ -209,6 +229,27 @@ typedef struct prvm_prog_fieldoffsets_s int viewmodelforclient; // ssqc int viewzoom; // ssqc int yaw_speed; // ssqc / csqc + int bouncefactor; // ssqc + int bouncestop; // ssqc + + int solid; // ssqc / csqc (physics) + int movetype; // ssqc / csqc (physics) + int modelindex; // ssqc / csqc (physics) + int mins; // ssqc / csqc (physics) + int maxs; // ssqc / csqc (physics) + int mass; // ssqc / csqc (physics) + int origin; // ssqc / csqc (physics) + int velocity; // ssqc / csqc (physics) + //int axis_forward; // ssqc / csqc (physics) + //int axis_left; // ssqc / csqc (physics) + //int axis_up; // ssqc / csqc (physics) + //int spinvelocity; // ssqc / csqc (physics) + //int angles; // ssqc / csqc (physics) + int avelocity; // ssqc / csqc (physics) + int jointtype; // ssqc / csqc (physics) + int enemy; // ssqc / csqc (physics) + int aiment; // ssqc / csqc (physics) + int movedir; // ssqc / csqc (physics) } prvm_prog_fieldoffsets_t; @@ -232,6 +273,7 @@ typedef struct prvm_prog_globaloffsets_s int trace_plane_normal; // ssqc / csqc int trace_plane_dist; // ssqc / csqc int trace_ent; // ssqc / csqc + int trace_networkentity; // csqc int trace_dphitcontents; // ssqc / csqc int trace_dphitq3surfaceflags; // ssqc / csqc int trace_dphittexturename; // ssqc / csqc @@ -242,7 +284,20 @@ typedef struct prvm_prog_globaloffsets_s int dmg_take; // csqc int dmg_save; // csqc int dmg_origin; // csqc - + int sb_showscores; // csqc + int drawfont; // csqc / menu + int require_spawnfunc_prefix; // ssqc + int worldstatus; // ssqc + int servertime; // csqc + int serverprevtime; // csqc + int serverdeltatime; // csqc + int gettaginfo_name; // ssqc / csqc + int gettaginfo_parent; // ssqc / csqc + int gettaginfo_offset; // ssqc / csqc + int gettaginfo_forward; // ssqc / csqc + int gettaginfo_right; // ssqc / csqc + int gettaginfo_up; // ssqc / csqc + int transparent_offset; // csqc } prvm_prog_globaloffsets_t; @@ -252,8 +307,10 @@ typedef struct prvm_prog_funcoffsets_s { func_t CSQC_ConsoleCommand; // csqc func_t CSQC_Ent_Remove; // csqc + func_t CSQC_Ent_Spawn; // csqc DP_CSQC_ENT_SPAWN extension (BlackHC - TODO: needs to be added to dpextensions.qc) func_t CSQC_Ent_Update; // csqc func_t CSQC_Event; // csqc [515]: engine call this for its own needs so csqc can do some things according to what engine it's running on. example: to say about edicts increase, whatever... + func_t CSQC_Event_Sound; // csqc : called by engine when an incoming sound packet arrives so CSQC can act on it func_t CSQC_Init; // csqc func_t CSQC_InputEvent; // csqc func_t CSQC_Parse_CenterPrint; // csqc @@ -262,17 +319,22 @@ typedef struct prvm_prog_funcoffsets_s func_t CSQC_Parse_TempEntity; // csqc [515]: very helpfull when you want to create your own particles/decals/etc for effects that already exist func_t CSQC_Shutdown; // csqc func_t CSQC_UpdateView; // csqc + func_t Gecko_Query; // csqc, mqc func_t EndFrame; // ssqc func_t RestoreGame; // ssqc func_t SV_ChangeTeam; // ssqc func_t SV_ParseClientCommand; // ssqc func_t SV_PlayerPhysics; // ssqc + func_t SV_OnEntityPreSpawnFunction; // ssqc + func_t SV_OnEntityNoSpawnFunction; // ssqc + func_t SV_OnEntityPostSpawnFunction; // ssqc func_t GameCommand; // any + func_t SV_Shutdown; // ssqc + func_t URI_Get_Callback; // any + func_t SV_PausedTic; //ssqc // menu qc only uses some functions, nothing else - func_t m_display; // mqc func_t m_draw; // mqc - func_t m_hide; // mqc func_t m_init; // mqc func_t m_keydown; // mqc func_t m_keyup; // mqc @@ -281,10 +343,20 @@ typedef struct prvm_prog_funcoffsets_s } prvm_prog_funcoffsets_t; +typedef struct prvm_stringbuffer_s +{ + int max_strings; + int num_strings; + char **strings; + const char *origin; +} +prvm_stringbuffer_t; + // [INIT] variables flagged with this token can be initialized by 'you' // NOTE: external code has to create and free the mempools but everything else is done by prvm ! typedef struct prvm_prog_s { + double starttime; dprograms_t *progs; mfunction_t *functions; char *strings; @@ -311,9 +383,12 @@ typedef struct prvm_prog_s // (simple optimization of the free string search) int firstfreeknownstring; const char **knownstrings; - unsigned char *knownstrings_freeable; + unsigned char *knownstrings_freeable; + const char **knownstrings_origin; const char ***stringshash; + memexpandablearray_t stringbuffersarray; + // all memory allocations related to this vm_prog (code, edicts, strings) mempool_t *progs_mempool; // [INIT] @@ -335,6 +410,7 @@ typedef struct prvm_prog_s int localstack_used; unsigned short headercrc; // [INIT] + unsigned short headercrc2; // [INIT] alternate CRC for tenebrae progs.dat unsigned short filecrc; @@ -342,7 +418,10 @@ typedef struct prvm_prog_s // until this point everything also exists (with the pr_ prefix) in the old vm qfile_t *openfiles[PRVM_MAX_OPENFILES]; + const char * openfiles_origin[PRVM_MAX_OPENFILES]; fssearch_t *opensearches[PRVM_MAX_OPENSEARCHES]; + const char * opensearches_origin[PRVM_MAX_OPENSEARCHES]; + struct clgecko_s *opengeckoinstances[PRVM_MAX_GECKOINSTANCES]; // copies of some vars that were former read from sv int num_edicts; @@ -355,8 +434,8 @@ typedef struct prvm_prog_s int reserved_edicts; // [INIT] prvm_edict_t *edicts; - void *edictsfields; - void *edictprivate; + void *edictsfields; + void *edictprivate; // size of the engine private struct int edictprivate_size; // [INIT] @@ -373,7 +452,7 @@ typedef struct prvm_prog_s char *name; // [INIT] // flag - used to store general flags like PRVM_GE_SELF, etc. - int flag; + int flag; char *extensionstring; // [INIT] @@ -381,6 +460,10 @@ typedef struct prvm_prog_s // used to indicate whether a prog is loaded qboolean loaded; + qboolean leaktest_active; + + // printed together with backtraces + const char *statestring; // prvm_builtin_mem_t *mem_list; @@ -410,6 +493,7 @@ typedef struct prvm_prog_s void (*error_cmd)(const char *format, ...) DP_FUNC_PRINTF(1); // [INIT] + void (*ExecuteProgram)(func_t fnum, const char *errormessage); // pointer to one of the *VM_ExecuteProgram functions } prvm_prog_t; extern prvm_prog_t * prog; @@ -450,7 +534,10 @@ void VM_Cmd_Reset(void); void PRVM_Init (void); -void PRVM_ExecuteProgram (func_t fnum, const char *errormessage); +void MVM_ExecuteProgram (func_t fnum, const char *errormessage); +void CLVM_ExecuteProgram (func_t fnum, const char *errormessage); +void SVVM_ExecuteProgram (func_t fnum, const char *errormessage); +#define PRVM_ExecuteProgram prog->ExecuteProgram #define PRVM_Alloc(buffersize) _PRVM_Alloc(buffersize, __FILE__, __LINE__) #define PRVM_Free(buffer) _PRVM_Free(buffer, __FILE__, __LINE__) @@ -459,13 +546,17 @@ void *_PRVM_Alloc (size_t buffersize, const char *filename, int fileline); void _PRVM_Free (void *buffer, const char *filename, int fileline); void _PRVM_FreeAll (const char *filename, int fileline); -void PRVM_Profile (int maxfunctions, int mininstructions); +void PRVM_Profile (int maxfunctions, int mininstructions, int sortby); void PRVM_Profile_f (void); +void PRVM_ChildProfile_f (void); +void PRVM_CallProfile_f (void); void PRVM_PrintFunction_f (void); void PRVM_PrintState(void); void PRVM_CrashAll (void); void PRVM_Crash (void); +void PRVM_ShortStackTrace(char *buf, size_t bufsize); +const char *PRVM_AllocationOrigin(void); ddef_t *PRVM_ED_FindField(const char *name); ddef_t *PRVM_ED_FindGlobal(const char *name); @@ -479,6 +570,7 @@ func_t PRVM_ED_FindFunctionOffset(const char *name); void PRVM_MEM_IncreaseEdicts(void); +qboolean PRVM_ED_CanAlloc(prvm_edict_t *e); prvm_edict_t *PRVM_ED_Alloc (void); void PRVM_ED_Free (prvm_edict_t *ed); void PRVM_ED_ClearEdict (prvm_edict_t *e); @@ -493,8 +585,9 @@ void PRVM_ED_ParseGlobals (const char *data); void PRVM_ED_LoadFromFile (const char *data); -prvm_edict_t *PRVM_EDICT_NUM_ERROR(int n, char *filename, int fileline); -#define PRVM_EDICT_NUM(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? prog->edicts + (n) : PRVM_EDICT_NUM_ERROR(n, __FILE__, __LINE__)) +unsigned int PRVM_EDICT_NUM_ERROR(unsigned int n, char *filename, int fileline); +#define PRVM_EDICT(n) (((unsigned)(n) < (unsigned int)prog->max_edicts) ? (unsigned int)(n) : PRVM_EDICT_NUM_ERROR((unsigned int)(n), __FILE__, __LINE__)) +#define PRVM_EDICT_NUM(n) (prog->edicts + PRVM_EDICT(n)) //int NUM_FOR_EDICT_ERROR(prvm_edict_t *e); #define PRVM_NUM_FOR_EDICT(e) ((int)((prvm_edict_t *)(e) - prog->edicts))