X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=progsvm.h;h=3204ebd8d1f01597f33f66272ff61f4986e2cb54;hp=673caea3a02955a1560117d34a9f2a1c8c36d065;hb=397530aecdd5492236e3dc5620ee7126078c07f3;hpb=00141603df070f44751efaf4afbf9c8cfc7e2e74 diff --git a/progsvm.h b/progsvm.h index 673caea3..3204ebd8 100644 --- a/progsvm.h +++ b/progsvm.h @@ -33,108 +33,6 @@ The code uses void pointers instead. #include "progdefs.h" // generated by program cdefs #include "clprogdefs.h" // generated by program cdefs -/* -typedef union vm_eval_s -{ - string_t string; - float _float; - float vector[3]; - func_t function; - int ivector[3]; - int _int; - int edict; -} vm_eval_t; - -typedef struct vm_link_s -{ - int entitynumber; - struct link_s *prev, *next; -} vm_link_t; - -#define ENTITYGRIDAREAS 16 - -typedef struct vm_edict_engineprivate_s -{ - // true if this edict is unused - qboolean free; - // sv.time when the object was freed (to prevent early reuse which could - // mess up client interpolation or obscure severe QuakeC bugs) - float freetime; - - // physics grid areas this edict is linked into - link_t areagrid[ENTITYGRIDAREAS]; - // since the areagrid can have multiple references to one entity, - // we should avoid extensive checking on entities already encountered - int areagridmarknumber; - - // old entity protocol, not used -#ifdef QUAKEENTITIES - // baseline values - entity_state_t baseline; - // LordHavoc: previous frame - entity_state_t deltabaseline; -#endif - - // LordHavoc: gross hack to make floating items still work - int suspendedinairflag; - // used by PushMove to keep track of where objects were before they were - // moved, in case they need to be moved back - vec3_t moved_from; - vec3_t moved_fromangles; -} -vm_edict_engineprivate_t; - -// the entire server entity structure -// NOTE: keep this small! priv and v are dynamic but this struct is not! -typedef struct vm_edict_s -{ - // engine-private fields (stored in dynamically resized array) - edict_engineprivate_t *e; - // QuakeC fields (stored in dynamically resized array) - entvars_t *v; -} -vm_edict_t; -*/ - -/*// LordHavoc: in an effort to eliminate time wasted on GetEdictFieldValue... see pr_edict.c for the functions which use these. -extern int eval_gravity; -extern int eval_button3; -extern int eval_button4; -extern int eval_button5; -extern int eval_button6; -extern int eval_button7; -extern int eval_button8; -extern int eval_glow_size; -extern int eval_glow_trail; -extern int eval_glow_color; -extern int eval_items2; -extern int eval_scale; -extern int eval_alpha; -extern int eval_renderamt; // HalfLife support -extern int eval_rendermode; // HalfLife support -extern int eval_fullbright; -extern int eval_ammo_shells1; -extern int eval_ammo_nails1; -extern int eval_ammo_lava_nails; -extern int eval_ammo_rockets1; -extern int eval_ammo_multi_rockets; -extern int eval_ammo_cells1; -extern int eval_ammo_plasma; -extern int eval_idealpitch; -extern int eval_pitch_speed; -extern int eval_viewmodelforclient; -extern int eval_nodrawtoclient; -extern int eval_exteriormodeltoclient; -extern int eval_drawonlytoclient; -extern int eval_ping; -extern int eval_movement; -extern int eval_pmodel; -extern int eval_punchvector; -extern int eval_viewzoom; -extern int eval_clientcolors; -extern int eval_tag_entity; -extern int eval_tag_index;*/ - typedef struct prvm_stack_s { int s; @@ -160,12 +58,6 @@ typedef struct prvm_required_field_s } prvm_required_field_t; -/*typedef struct prvm_link_s -{ - int entitynumber; - struct link_s *prev, *next; -} prvm_link_t;*/ - // AK: I dont call it engine private cause it doesnt really belongs to the engine // it belongs to prvm. typedef struct prvm_edict_private_s @@ -182,6 +74,8 @@ typedef struct prvm_edict_s { prvm_edict_private_t *required; void *vp; + // FIXME: this server pointer really means world, not server + // (it is used by both server qc and client qc, but not menu qc) edict_engineprivate_t *server; // add other private structs as you desire // new structs have to start with the elements of prvm_edit_private_t @@ -209,47 +103,175 @@ typedef struct prvm_edict_s } fields; } prvm_edict_t; -#define PRVM_GETEDICTFIELDVALUE(ed, fieldoffset) (fieldoffset ? (prvm_eval_t *)((unsigned char *)ed->fields.vp + fieldoffset) : NULL) -#define PRVM_GETGLOBALFIELDVALUE(fieldoffset) (fieldoffset ? (prvm_eval_t *)((unsigned char *)prog->globals.generic + fieldoffset) : NULL) - -/*// this struct is the basic requirement for a qc prog -typedef struct prvm_pr_globalvars_s -{ - int pad[28]; -} prvm_pr_globalvars_t; -*/ -/* -extern mfunction_t *SV_PlayerPhysicsQC; -extern mfunction_t *EndFrameQC; -//KrimZon - SERVER COMMANDS IN QUAKEC -extern mfunction_t *SV_ParseClientCommandQC; -*/ -//============================================================================ -/* -typedef struct prvm_builtin_mem_s -{ - void (*init)(void); - void (*deinit)(void); - - void *mem; -} prvm_builtin_mem_t; -*/ +#define PRVM_EDICTFIELDVALUE(ed, fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((int *)ed->fields.vp + fieldoffset) : NULL) +#define PRVM_GLOBALFIELDVALUE(fieldoffset) (fieldoffset >= 0 ? (prvm_eval_t *)((int *)prog->globals.generic + fieldoffset) : NULL) //============================================================================ -/* -#define PRVM_FE_NEXTHINK 2 -#define PRVM_FE_THINK 4 -#define PRVM_FE_FRAME 8 -*/ -#define PRVM_FE_CLASSNAME 8 -#define PRVM_FE_CHAIN 4 #define PRVM_OP_STATE 1 -#define PRVM_MAX_STACK_DEPTH 256 -#define PRVM_LOCALSTACK_SIZE 2048 +#define PRVM_MAX_STACK_DEPTH 1024 +#define PRVM_LOCALSTACK_SIZE 16384 + +#define PRVM_MAX_OPENFILES 256 +#define PRVM_MAX_OPENSEARCHES 128 typedef void (*prvm_builtin_t) (void); +// NOTE: field offsets use -1 for NULL +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 alpha; // ssqc / csqc + int ammo_cells1; // ssqc - Dissolution of Eternity mission pack + int ammo_lava_nails; // ssqc - Dissolution of Eternity mission pack + int ammo_multi_rockets; // ssqc - Dissolution of Eternity mission pack + int ammo_nails1; // ssqc - Dissolution of Eternity mission pack + int ammo_plasma; // ssqc - Dissolution of Eternity mission pack + int ammo_rockets1; // ssqc - Dissolution of Eternity mission pack + int ammo_shells1; // ssqc - Dissolution of Eternity mission pack + int angles; // common - used by changeyaw/changepitch + int button3; // ssqc + int button4; // ssqc + int button5; // ssqc + int button6; // ssqc + int button7; // ssqc + int button8; // ssqc + int button9; // ssqc + int button10; // ssqc + int button11; // ssqc + int button12; // ssqc + int button13; // ssqc + int button14; // ssqc + int button15; // ssqc + int button16; // ssqc + int buttonchat; // ssqc + int buttonuse; // ssqc + int chain; // common - used by find builtins + int classname; // common + int clientcolors; // ssqc + int color; // ssqc + int colormod; // ssqc / csqc + int contentstransition; // ssqc + int cursor_active; // ssqc + int cursor_screen; // ssqc + int cursor_trace_endpos; // ssqc + int cursor_trace_ent; // ssqc + int cursor_trace_start; // ssqc + int customizeentityforclient; // ssqc + int dimension_hit; // ssqc / csqc + int dimension_solid; // ssqc / csqc + int disableclientprediction; // ssqc + int dphitcontentsmask; // ssqc / csqc + int drawonlytoclient; // ssqc + int effects; // ssqc / csqc + int exteriormodeltoclient; // ssqc + int fatness; // ssqc / csqc + int forceshader; // csqc + int frame1time; // csqc + int frame2; // csqc + int frame2time; // 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 gravity; // ssqc + int groundentity; // ssqc / csqc + int hull; // ssqc / csqc + int ideal_yaw; // ssqc / csqc + int idealpitch; // ssqc / csqc + int items2; // ssqc + int lerpfrac; // csqc + int light_lev; // ssqc + int modelflags; // ssqc + int movement; // ssqc + int nextthink; // common - used by OP_STATE + int netaddress; // ssqc + int nodrawtoclient; // ssqc + int pflags; // ssqc + int ping; // ssqc + int pitch_speed; // ssqc / csqc + int playermodel; // ssqc + int playerskin; // ssqc + int pmodel; // ssqc + int punchvector; // ssqc + int renderamt; // ssqc - HalfLife support + int renderflags; // csqc + int rendermode; // ssqc - HalfLife support + int scale; // ssqc / csqc + int style; // ssqc + int tag_entity; // ssqc / csqc + int tag_index; // ssqc / csqc + int think; // common - used by OP_STATE + int viewmodelforclient; // ssqc + int viewzoom; // ssqc + int yaw_speed; // ssqc / csqc +} +prvm_prog_fieldoffsets_t; + +// NOTE: global offsets use -1 for NULL +typedef struct prvm_prog_globaloffsets_s +{ + // server and client use a lot of similar globals, so this is combined + int SV_InitCmd; // ssqc + int self; // common + int time; // ssqc / csqc + int v_forward; // ssqc / csqc + int v_right; // ssqc / csqc + int v_up; // ssqc / csqc + int trace_allsolid; // ssqc / csqc + int trace_startsolid; // ssqc / csqc + int trace_fraction; // ssqc / csqc + int trace_inwater; // ssqc / csqc + int trace_inopen; // ssqc / csqc + int trace_endpos; // ssqc / csqc + int trace_plane_normal; // ssqc / csqc + int trace_plane_dist; // ssqc / csqc + int trace_ent; // ssqc / csqc + int trace_dphitcontents; // ssqc / csqc + int trace_dphitq3surfaceflags; // ssqc / csqc + int trace_dphittexturename; // ssqc / csqc + int trace_dpstartcontents; // ssqc / csqc +} +prvm_prog_globaloffsets_t; + +// these are initialized using PRVM_ED_FindFunction +// NOTE: function offsets use 0 for NULL +typedef struct prvm_prog_funcoffsets_s +{ + func_t CSQC_ConsoleCommand; // csqc + func_t CSQC_Ent_Remove; // csqc + 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_Init; // csqc + func_t CSQC_InputEvent; // csqc + func_t CSQC_Parse_CenterPrint; // csqc + func_t CSQC_Parse_Print; // csqc + func_t CSQC_Parse_StuffCmd; // csqc + 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 EndFrame; // ssqc + func_t RestoreGame; // ssqc + func_t SV_ChangeTeam; // ssqc + func_t SV_ParseClientCommand; // ssqc + func_t SV_PlayerPhysics; // ssqc + func_t GameCommand; // any + + // 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 + func_t m_shutdown; // mqc + func_t m_toggle; // mqc +} +prvm_prog_funcoffsets_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 @@ -266,6 +288,8 @@ typedef struct prvm_prog_s int *statement_linenums; // NULL if not available + double *statement_profile; // only incremented if prvm_statementprofiling is on + union { float *generic; globalvars_t *server; @@ -308,6 +332,9 @@ 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]; + fssearch_t *opensearches[PRVM_MAX_OPENSEARCHES]; + // copies of some vars that were former read from sv int num_edicts; // number of edicts for which space has been (should be) allocated @@ -318,7 +345,6 @@ typedef struct prvm_prog_s // number of reserved edicts (allocated from 1) int reserved_edicts; // [INIT] - prvm_edict_t *edicts; void *edictsfields; void *edictprivate; @@ -326,11 +352,9 @@ typedef struct prvm_prog_s // size of the engine private struct int edictprivate_size; // [INIT] - // has to be updated every frame - so the vm time is up-to-date - // AK changed so time will point to the time field (if there is one) else it points to _time - // actually should be double, but qc doesnt support it - float *time; - float _time; + prvm_prog_fieldoffsets_t fieldoffsets; + prvm_prog_globaloffsets_t globaloffsets; + prvm_prog_funcoffsets_t funcoffsets; // allow writing to world entity fields, this is set by server init and // cleared before first server frame @@ -351,7 +375,7 @@ typedef struct prvm_prog_s // prvm_builtin_mem_t *mem_list; -// now passes as parameter of PRVM_LoadProgs +// now passed as parameter of PRVM_LoadProgs // char **required_func; // int numrequiredfunc; @@ -375,7 +399,7 @@ typedef struct prvm_prog_s void (*init_cmd)(void); // [INIT] used by PRVM_InitProg void (*reset_cmd)(void); // [INIT] used by PRVM_ResetProg - void (*error_cmd)(const char *format, ...); // [INIT] + void (*error_cmd)(const char *format, ...) DP_FUNC_PRINTF(1); // [INIT] } prvm_prog_t; @@ -399,8 +423,7 @@ extern const int vm_sv_numbuiltins; extern const int vm_cl_numbuiltins; extern const int vm_m_numbuiltins; -extern char * vm_sv_extensions; -extern char * vm_cl_extensions; +extern char * vm_sv_extensions; // client also uses this extern char * vm_m_extensions; void VM_SV_Cmd_Init(void); @@ -427,16 +450,23 @@ 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_f (void); +void PRVM_PrintFunction_f (void); void PRVM_PrintState(void); void PRVM_CrashAll (void); void PRVM_Crash (void); -int PRVM_ED_FindFieldOffset(const char *field); -int PRVM_ED_FindGlobalOffset(const char *global); -ddef_t *PRVM_ED_FindField (const char *name); -mfunction_t *PRVM_ED_FindFunction (const char *name); +ddef_t *PRVM_ED_FindField(const char *name); +ddef_t *PRVM_ED_FindGlobal(const char *name); +mfunction_t *PRVM_ED_FindFunction(const char *name); + +int PRVM_ED_FindFieldOffset(const char *name); +int PRVM_ED_FindGlobalOffset(const char *name); +func_t PRVM_ED_FindFunctionOffset(const char *name); +#define PRVM_ED_FindFieldOffset_FromStruct(st, field) prog->fieldoffsets . field = ((int *)(&((st *)NULL)-> field ) - ((int *)NULL)) +#define PRVM_ED_FindGlobalOffset_FromStruct(st, field) prog->globaloffsets . field = ((int *)(&((st *)NULL)-> field ) - ((int *)NULL)) void PRVM_MEM_IncreaseEdicts(void); @@ -444,6 +474,7 @@ prvm_edict_t *PRVM_ED_Alloc (void); void PRVM_ED_Free (prvm_edict_t *ed); void PRVM_ED_ClearEdict (prvm_edict_t *e); +void PRVM_PrintFunctionStatements (const char *name); void PRVM_ED_Print(prvm_edict_t *ed); void PRVM_ED_Write (qfile_t *f, prvm_edict_t *ed); const char *PRVM_ED_ParseEdict (const char *data, prvm_edict_t *ent); @@ -494,6 +525,7 @@ void PRVM_ED_PrintNum (int ent); const char *PRVM_GetString(int num); int PRVM_SetEngineString(const char *s); +int PRVM_SetTempString(const char *s); int PRVM_AllocString(size_t bufferlength, char **pointer); void PRVM_FreeString(int num); @@ -510,7 +542,6 @@ void PRVM_FreeString(int num); #define PRVM_End prog = 0 #endif - //#define PRVM_SAFENAME #ifndef PRVM_SAFENAME # define PRVM_NAME (prog->name) @@ -535,13 +566,14 @@ Load a program with LoadProgs */ void PRVM_InitProg(int prognr); // LoadProgs expects to be called right after InitProg -void PRVM_LoadProgs (const char *filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field); +void PRVM_LoadProgs (const char *filename, int numrequiredfunc, char **required_func, int numrequiredfields, prvm_required_field_t *required_field, int numrequiredglobals, char **required_global); void PRVM_ResetProg(void); qboolean PRVM_ProgLoaded(int prognr); int PRVM_GetProgNr(void); +void VM_Warning(const char *fmt, ...) DP_FUNC_PRINTF(1); // TODO: fill in the params //void PRVM_Create();