Merge pull request #44 from thecybermind/dev_floatfix

Better handle floating point arguments for GetGameAPI functions

Author: thecybermind

include/gameapi.hpp

@@ -29,6 +29,8 @@ Created By:
 #define QVM_PROGRAMSTACK_SIZE           0x10000
 // Default size of temporary hunk segment (ioRTCW defaults to 2 MiB) (1MiB)
 #define QVM_HUNK_SIZE                   0x100000
+// Alignment of hunk in bytes
+#define QVM_HUNK_ALIGNMENT              8
 
 // Round "var" up to next power of 2: https://stackoverflow.com/a/1322548/809900
 #define QVM_NEXT_POW_2(var) var--; var |= var >> 1; var |= var >> 2; var |= var >> 4; var |= var >> 8; var |= var >> 16; var++

include/qvm.h

@@ -260,4 +260,19 @@ T util_max(T a, T b) {
     return (a > b ? a : b);
 }
 
+
+template <class OutputClass, class InputClass>
+union horrible_union {
+    OutputClass out;
+    InputClass in;
+};
+// Same as reinterpret_cast<T>(x) but for anything
+template <class OutputClass, class InputClass>
+inline OutputClass horrible_cast(const InputClass input) {
+    horrible_union<OutputClass, InputClass> u;
+    u.in = input;
+    return u.out;
+}
+
+
 #endif // QMM2_UTIL_H

include/util.hpp

@@ -150,19 +150,19 @@ intptr_t JASP_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(G2API_PrecacheGhoul2Model, G_G2API_PRECACHEGHOUL2MODEL);
         ROUTE_IMPORT(G2API_InitGhoul2Model, G_G2API_INITGHOUL2MODEL);
         ROUTE_IMPORT(G2API_SetSkin, G_G2API_SETSKIN);
-        ROUTE_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, (CGhoul2Info*), (const char*), (int), (int), (int), *(float*)&, (int), *(float*)&, (int));
+        ROUTE_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, CGhoul2Info*, const char*, int, int, int, FLOAT_CAST, int, FLOAT_CAST, int);
         ROUTE_IMPORT(G2API_SetBoneAngles, G_G2API_SETBONEANGLES);
         ROUTE_IMPORT(G2API_SetBoneAnglesIndex, G_G2API_SETBONEANGLESINDEX);
         ROUTE_IMPORT(G2API_SetBoneAnglesMatrix, G_G2API_SETBONEANGLESMATRIX);
         ROUTE_IMPORT(G2API_CopyGhoul2Instance, G_G2API_COPYGHOUL2INSTANCE);
-        ROUTE_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, (CGhoul2Info*), (int), (int), (int), (int), *(float*)&, (int), *(float*)&, (int));
+        ROUTE_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, CGhoul2Info*, int, int, int, int, FLOAT_CAST, int, FLOAT_CAST, int);
         ROUTE_IMPORT(G2API_SetLodBias, G_G2API_SETLODBIAS);
         ROUTE_IMPORT(G2API_SetShader, G_G2API_SETSHADER);
         ROUTE_IMPORT(G2API_RemoveGhoul2Model, G_G2API_REMOVEGHOUL2MODEL);
         ROUTE_IMPORT(G2API_SetSurfaceOnOff, G_G2API_SETSURFACEONOFF);
         ROUTE_IMPORT(G2API_SetRootSurface, G_G2API_SETROOTSURFACE);
         ROUTE_IMPORT(G2API_RemoveSurface, G_G2API_REMOVESURFACE);
-        ROUTE_IMPORT_6(G2API_AddSurface, G_G2API_ADDSURFACE, (CGhoul2Info*), (int), (int), *(float*)&, *(float*)&, (int));
+        ROUTE_IMPORT_6(G2API_AddSurface, G_G2API_ADDSURFACE, CGhoul2Info*, int, int, FLOAT_CAST, FLOAT_CAST, int);
         ROUTE_IMPORT(G2API_GetBoneAnim, G_G2API_GETBONEANIM);
         ROUTE_IMPORT(G2API_GetBoneAnimIndex, G_G2API_GETBONEANIMINDEX);
         ROUTE_IMPORT(G2API_GetAnimRange, G_G2API_GETANIMRANGE);
@@ -211,7 +211,7 @@ intptr_t JASP_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(G2API_SetRagDoll, G_G2API_SETRAGDOLL);
         ROUTE_IMPORT(G2API_AnimateG2Models, G_G2API_ANIMATEG2MODELS);
         ROUTE_IMPORT(G2API_RagPCJConstraint, G_G2API_RAGPCJCONSTRAINT);
-        ROUTE_IMPORT_3(G2API_RagPCJGradientSpeed, G_G2API_RAGPCJGRADIENTSPEED, (CGhoul2Info_v&), (const char*), *(float*)&);
+        ROUTE_IMPORT_3(G2API_RagPCJGradientSpeed, G_G2API_RAGPCJGRADIENTSPEED, CGhoul2Info_v&, const char*, FLOAT_CAST);
         ROUTE_IMPORT(G2API_RagEffectorGoal, G_G2API_RAGEFFECTORGOAL);
         ROUTE_IMPORT(G2API_GetRagBonePos, G_G2API_GETRAGBONEPOS);
         ROUTE_IMPORT(G2API_RagEffectorKick, G_G2API_RAGEFFECTORKICK);
@@ -229,7 +229,7 @@ intptr_t JASP_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(WE_GetWindVector, G_WE_GETWINDVECTOR);
         ROUTE_IMPORT(WE_GetWindGusting, G_WE_GETWINDGUSTING);
         ROUTE_IMPORT(WE_IsOutside, G_WE_ISOUTSIDE);
-        ROUTE_IMPORT_1_F(WE_IsOutsideCausingPain, G_WE_ISOUTSIDECAUSINGPAIN, (float*));
+        ROUTE_IMPORT_1_F(WE_IsOutsideCausingPain, G_WE_ISOUTSIDECAUSINGPAIN, float*);
         ROUTE_IMPORT_0_F(WE_GetChanceOfSaberFizz, G_WE_GETCHANCEOFSABERFIZZ);
         ROUTE_IMPORT(WE_IsShaking, G_WE_ISSHAKING);
         ROUTE_IMPORT(WE_AddWeatherZone, G_WE_ADDWEATHERZONE);
@@ -670,12 +670,12 @@ game_import_t JASP_GameSupport::qmm_import = {
         GEN_IMPORT(G2API_PrecacheGhoul2Model, G_G2API_PRECACHEGHOUL2MODEL),
         GEN_IMPORT(G2API_InitGhoul2Model, G_G2API_INITGHOUL2MODEL),
         GEN_IMPORT(G2API_SetSkin, G_G2API_SETSKIN),
-        GEN_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, qboolean, CGhoul2Info*, const char*, const int, const int, const int, const float, const int, const float, const int),
+        GEN_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, qboolean, CGhoul2Info*, const char*, int, int, int, float, int, float, int),
         GEN_IMPORT(G2API_SetBoneAngles, G_G2API_SETBONEANGLES),
         GEN_IMPORT(G2API_SetBoneAnglesIndex, G_G2API_SETBONEANGLESINDEX),
         GEN_IMPORT(G2API_SetBoneAnglesMatrix, G_G2API_SETBONEANGLESMATRIX),
         GEN_IMPORT(G2API_CopyGhoul2Instance, G_G2API_COPYGHOUL2INSTANCE),
-        GEN_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, qboolean, CGhoul2Info*, const int, const int, const int, const int, const float, const int, const float, const int),
+        GEN_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, qboolean, CGhoul2Info*, int, int, int, int, float, int, float, int),
         GEN_IMPORT(G2API_SetLodBias, G_G2API_SETLODBIAS),
         GEN_IMPORT(G2API_SetShader, G_G2API_SETSHADER),
         GEN_IMPORT(G2API_RemoveGhoul2Model, G_G2API_REMOVEGHOUL2MODEL),
@@ -731,7 +731,7 @@ game_import_t JASP_GameSupport::qmm_import = {
         GEN_IMPORT(G2API_SetRagDoll, G_G2API_SETRAGDOLL),
         GEN_IMPORT(G2API_AnimateG2Models, G_G2API_ANIMATEG2MODELS),
         GEN_IMPORT(G2API_RagPCJConstraint, G_G2API_RAGPCJCONSTRAINT),
-        GEN_IMPORT_3(G2API_RagPCJGradientSpeed, G_G2API_RAGPCJGRADIENTSPEED, qboolean, CGhoul2Info_v&, const char*, const float),
+        GEN_IMPORT_3(G2API_RagPCJGradientSpeed, G_G2API_RAGPCJGRADIENTSPEED, qboolean, CGhoul2Info_v&, const char*, float),
         GEN_IMPORT(G2API_RagEffectorGoal, G_G2API_RAGEFFECTORGOAL),
         GEN_IMPORT(G2API_GetRagBonePos, G_G2API_GETRAGBONEPOS),
         GEN_IMPORT(G2API_RagEffectorKick, G_G2API_RAGEFFECTORKICK),

src/game_jasp.cpp

@@ -150,8 +150,8 @@ intptr_t JK2SP_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(G2API_SetSurfaceOnOff, G_G2API_SETSURFACEONOFF);
         ROUTE_IMPORT(G2API_SetRootSurface, G_G2API_SETROOTSURFACE);
         ROUTE_IMPORT(G2API_RemoveSurface, G_G2API_REMOVESURFACE);
-        ROUTE_IMPORT_6(G2API_AddSurface, G_G2API_ADDSURFACE, (CGhoul2Info*), (int), (int), *(float*)&, *(float*)&, (int));
-        ROUTE_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, (CGhoul2Info*), (const char*), (int), (int), (int), *(float*)&, (int), *(float*)&, (int));
+        ROUTE_IMPORT_6(G2API_AddSurface, G_G2API_ADDSURFACE, CGhoul2Info*, int, int, FLOAT_CAST, FLOAT_CAST, int);
+        ROUTE_IMPORT_9(G2API_SetBoneAnim, G_G2API_SETBONEANIM, CGhoul2Info*, const char*, int, int, int, FLOAT_CAST, int, FLOAT_CAST, int);
         ROUTE_IMPORT(G2API_GetBoneAnim, G_G2API_GETBONEANIM);
         ROUTE_IMPORT(G2API_GetBoneAnimIndex, G_G2API_GETBONEANIMINDEX);
         ROUTE_IMPORT(G2API_GetAnimRange, G_G2API_GETANIMRANGE);
@@ -193,7 +193,7 @@ intptr_t JK2SP_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(G2API_StopBoneAnimIndex, G_G2API_STOPBONEANIMINDEX);
         ROUTE_IMPORT(G2API_SetBoneAnglesIndex, G_G2API_SETBONEANGLESINDEX);
         ROUTE_IMPORT(G2API_SetBoneAnglesMatrixIndex, G_G2API_SETBONEANGLESMATRIXINDEX);
-        ROUTE_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, (CGhoul2Info*), (int), (int), (int), (int), (float), (int), (float), (int));
+        ROUTE_IMPORT_9(G2API_SetBoneAnimIndex, G_G2API_SETBONEANIMINDEX, CGhoul2Info*, int, int, int, int, FLOAT_CAST, int, FLOAT_CAST, int);
         ROUTE_IMPORT(G2API_SaveGhoul2Models, G_G2API_SAVEGHOUL2MODELS);
         ROUTE_IMPORT(G2API_LoadGhoul2Models, G_G2API_LOADGHOUL2MODELS);
         ROUTE_IMPORT(G2API_LoadSaveCodeDestructGhoul2Info, G_G2API_LOADSAVECODEDESTRUCTGHOUL2INFO);
@@ -305,7 +305,7 @@ intptr_t JK2SP_GameSupport::vmMain(intptr_t cmd, ...) {
         ROUTE_EXPORT(RunFrame, GAME_RUN_FRAME);
         ROUTE_EXPORT(ConsoleCommand, GAME_CONSOLE_COMMAND);
         ROUTE_EXPORT(PrintEntClassname, GAME_PRINTENTCLASSNAME);
-        ROUTE_EXPORT_3(ValidateAnimRange, GAME_VALIDATEANIMRANGE, (int), (int), *(float*)&);
+        ROUTE_EXPORT_3(ValidateAnimRange, GAME_VALIDATEANIMRANGE, int, int, FLOAT_CAST);
 
         // handle cmds for variables, this is how a plugin would get these values if needed
         ROUTE_EXPORT_VAR(apiversion, GAMEV_APIVERSION);

src/game_jk2sp.cpp

@@ -147,7 +147,7 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(GetArchiveFileName, G_GETARCHIVEFILENAME);
         // handled below since we do special handling to deal with the "when" argument
         // ROUTE_IMPORT(SendConsoleCommand, G_SEND_CONSOLE_COMMAND);
-        ROUTE_IMPORT_1_V(DebugGraph, G_DEBUGGRAPH, *(float*)&);
+        ROUTE_IMPORT_1_V(DebugGraph, G_DEBUGGRAPH, FLOAT_CAST);
         ROUTE_IMPORT(SendServerCommand, G_SEND_SERVER_COMMAND);
         ROUTE_IMPORT(DropClient, G_DROP_CLIENT);
         ROUTE_IMPORT(MSG_WriteBits, G_MSG_WRITEBITS);
@@ -156,11 +156,11 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(MSG_WriteSVC, G_MSG_WRITESVC);
         ROUTE_IMPORT(MSG_WriteShort, G_MSG_WRITESHORT);
         ROUTE_IMPORT(MSG_WriteLong, G_MSG_WRITELONG);
-        ROUTE_IMPORT_1_V(MSG_WriteFloat, G_MSG_WRITEFLOAT, *(float*)&);
+        ROUTE_IMPORT_1_V(MSG_WriteFloat, G_MSG_WRITEFLOAT, FLOAT_CAST);
         ROUTE_IMPORT(MSG_WriteString, G_MSG_WRITESTRING);
-        ROUTE_IMPORT_1_V(MSG_WriteAngle8, G_MSG_WRITEANGLE8, *(float*)&);
-        ROUTE_IMPORT_1_V(MSG_WriteAngle16, G_MSG_WRITEANGLE16, *(float*)&);
-        ROUTE_IMPORT_1_V(MSG_WriteCoord, G_MSG_WRITECOORD, *(float*)&);
+        ROUTE_IMPORT_1_V(MSG_WriteAngle8, G_MSG_WRITEANGLE8, FLOAT_CAST);
+        ROUTE_IMPORT_1_V(MSG_WriteAngle16, G_MSG_WRITEANGLE16, FLOAT_CAST);
+        ROUTE_IMPORT_1_V(MSG_WriteCoord, G_MSG_WRITECOORD, FLOAT_CAST);
         ROUTE_IMPORT(MSG_WriteDir, G_MSG_WRITEDIR);
         ROUTE_IMPORT(MSG_StartCGM, G_MSG_STARTCGM);
         ROUTE_IMPORT(MSG_EndCGM, G_MSG_ENDCGM);
@@ -201,18 +201,18 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(TIKI_NumAnims, G_TIKI_NUMANIMS);
         ROUTE_IMPORT(TIKI_NumSurfaces, G_TIKI_NUMSURFACES);
         ROUTE_IMPORT(TIKI_NumTags, G_TIKI_NUMTAGS);
-        ROUTE_IMPORT_4_V(TIKI_CalculateBounds, G_TIKI_CALCULATEBOUNDS, (dtiki_t*), *(float*)&, (float*), (float*));
+        ROUTE_IMPORT_4_V(TIKI_CalculateBounds, G_TIKI_CALCULATEBOUNDS, dtiki_t*, FLOAT_CAST, float*, float*);
         ROUTE_IMPORT(TIKI_GetSkeletor, G_TIKI_GETSKELETOR);
         ROUTE_IMPORT(Anim_NameForNum, G_ANIM_NAMEFORNUM);
         ROUTE_IMPORT(Anim_NumForName, G_ANIM_NUMFORNAME);
         ROUTE_IMPORT(Anim_Random, G_ANIM_RANDOM);
         ROUTE_IMPORT(Anim_NumFrames, G_ANIM_NUMFRAMES);
-        ROUTE_IMPORT_2_F(Anim_Time, G_ANIM_TIME, (dtiki_t*), (int));
-        ROUTE_IMPORT_2_F(Anim_Frametime, G_ANIM_FRAMETIME, (dtiki_t*), (int));
-        ROUTE_IMPORT_2_F(Anim_CrossTime, G_ANIM_CROSSTIME, (dtiki_t*), (int));
+        ROUTE_IMPORT_2_F(Anim_Time, G_ANIM_TIME, dtiki_t*, int);
+        ROUTE_IMPORT_2_F(Anim_Frametime, G_ANIM_FRAMETIME, dtiki_t*, int);
+        ROUTE_IMPORT_2_F(Anim_CrossTime, G_ANIM_CROSSTIME, dtiki_t*, int);
         ROUTE_IMPORT(Anim_Delta, G_ANIM_DELTA);
         ROUTE_IMPORT(Anim_HasDelta, G_ANIM_HASDELTA);
-        ROUTE_IMPORT_5_V(Anim_DeltaOverTime, G_ANIM_DELTAOVERTIME, (dtiki_t*), (int), *(float*)&, *(float*)&, (float*));
+        ROUTE_IMPORT_5_V(Anim_DeltaOverTime, G_ANIM_DELTAOVERTIME, dtiki_t*, int, FLOAT_CAST, FLOAT_CAST, float*);
         ROUTE_IMPORT(Anim_Flags, G_ANIM_FLAGS);
         ROUTE_IMPORT(Anim_FlagsSkel, G_ANIM_FLAGSSKEL);
         ROUTE_IMPORT(Anim_HasCommands, G_ANIM_HASCOMMANDS);
@@ -225,10 +225,10 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(Surface_NumToName, G_SURFACE_NUMTONAME);
         ROUTE_IMPORT(Tag_NumForName, G_TAG_NUMFORNAME);
         ROUTE_IMPORT(Tag_NameForNum, G_TAG_NAMEFORNUM);
-        ROUTE_IMPORT_5(TIKI_OrientationInternal, G_TIKI_ORIENTATIONINTERNAL, (orientation_t*), (dtiki_t*), (int), (int), *(float*)&);
+        ROUTE_IMPORT_5(TIKI_OrientationInternal, G_TIKI_ORIENTATIONINTERNAL, orientation_t*, dtiki_t*, int, int, FLOAT_CAST);
         ROUTE_IMPORT(TIKI_TransformInternal, G_TIKI_TRANSFORMINTERNAL);
-        ROUTE_IMPORT_4(TIKI_IsOnGroundInternal, G_TIKI_ISONGROUNDINTERNAL, (dtiki_t*), (int), (int), *(float*)&);
-        ROUTE_IMPORT_6_V(TIKI_SetPoseInternal, G_TIKI_SETPOSEINTERNAL, (dtiki_t*), (int), (const frameInfo_t*), (int*), (vec4_t*), *(float*)&);
+        ROUTE_IMPORT_4(TIKI_IsOnGroundInternal, G_TIKI_ISONGROUNDINTERNAL, dtiki_t*, int, int, FLOAT_CAST);
+        ROUTE_IMPORT_6_V(TIKI_SetPoseInternal, G_TIKI_SETPOSEINTERNAL, dtiki_t*, int, const frameInfo_t*, int*, vec4_t*, FLOAT_CAST);
         ROUTE_IMPORT(CM_GetHitLocationInfo, G_CM_GETHITLOCATIONINFO);
         ROUTE_IMPORT(CM_GetHitLocationInfoSecondary, G_CM_GETHITLOCATIONINFOSECONDARY);
         ROUTE_IMPORT(Alias_Add, G_ALIAS_ADD);
@@ -243,9 +243,9 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(GlobalAlias_Clear, G_GLOBALALIAS_CLEAR);
         ROUTE_IMPORT(centerprintf, G_CENTERPRINTF);
         ROUTE_IMPORT(locationprintf, G_LOCATIONPRINTF);
-        ROUTE_IMPORT_9_V(Sound, G_SOUND, (vec3_t*), (int), (int), (const char*), *(float*)&, *(float*)&, *(float*)&, *(float*)&, (int));
+        ROUTE_IMPORT_9_V(Sound, G_SOUND, vec3_t*, int, int, const char*, FLOAT_CAST, FLOAT_CAST, FLOAT_CAST, FLOAT_CAST, int);
         ROUTE_IMPORT(StopSound, G_STOPSOUND);
-        ROUTE_IMPORT_2_F(SoundLength, G_SOUNDLENGTH, (int), (const char*));
+        ROUTE_IMPORT_2_F(SoundLength, G_SOUNDLENGTH, int, const char*);
         ROUTE_IMPORT(SoundAmplitudes, G_SOUNDAMPLITUDES);
         ROUTE_IMPORT(S_IsSoundPlaying, G_S_ISSOUNDPLAYING);
         ROUTE_IMPORT(CalcCRC, G_CALCCRC);
@@ -271,7 +271,7 @@ intptr_t MOHAA_GameSupport::syscall(intptr_t cmd, ...) {
         ROUTE_IMPORT(HudDrawRect, G_HUDDRAWRECT);
         ROUTE_IMPORT(HudDrawVirtualSize, G_HUDDRAWVIRTUALSIZE);
         ROUTE_IMPORT(HudDrawColor, G_HUDDRAWCOLOR);
-        ROUTE_IMPORT_2_V(HudDrawAlpha, G_HUDDRAWALPHA, (int), *(float*)&);
+        ROUTE_IMPORT_2_V(HudDrawAlpha, G_HUDDRAWALPHA, int, FLOAT_CAST);
         ROUTE_IMPORT(HudDrawString, G_HUDDRAWSTRING);
         ROUTE_IMPORT(HudDrawFont, G_HUDDRAWFONT);
         ROUTE_IMPORT(SanitizeName, G_SANITIZENAME);
@@ -478,7 +478,7 @@ intptr_t MOHAA_GameSupport::vmMain(intptr_t cmd, ...) {
         ROUTE_EXPORT(ArchiveString, GAME_ARCHIVE_STRING);
         ROUTE_EXPORT(ArchiveSvsTime, GAME_ARCHIVE_SVSTIME);
         ROUTE_EXPORT(TIKI_Orientation, GAME_TIKI_ORIENTATION);
-        ROUTE_EXPORT_7_V(DebugCircle, GAME_DEBUG_CIRCLE, (float*), *(float*)&, *(float*)&, *(float*)&, *(float*)&, *(float*)&, (qboolean));
+        ROUTE_EXPORT_7_V(DebugCircle, GAME_DEBUG_CIRCLE, float*, FLOAT_CAST, FLOAT_CAST, FLOAT_CAST, FLOAT_CAST, FLOAT_CAST, qboolean);
         ROUTE_EXPORT(SetFrameNumber, GAME_SET_FRAME_NUMBER);
         ROUTE_EXPORT(SoundCallback, GAME_SOUND_CALLBACK);