R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement memory allocation singleton wrappers

Browse Source 
* Pointer to g_pMemAllocSingleton
* New wrapper for returning the singleton, and creating one if not yet initialized (game shares the same pointer, and is aware of its creation).
This commit is contained in:
Kawe Mazidjatari 2022-07-22 16:34:10 +02:00
parent 8198866f6f
commit c405c23934
13 changed files with 109 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
r5dev/core/init.cpp
View File

@ -10,6 +10,7 @@
#include "tier0/jobthread.h"
#include "tier0/threadtools.h"
#include "tier0/tslist.h"
#include "tier0/memstd.h"
#include "tier0/fasttimer.h"
#include "tier0/cpu.h"
#include "tier0/commandline.h"

19
r5dev/engine/debugoverlay.cpp
View File

@ -6,7 +6,7 @@
#include "core/stdafx.h"
#include "common/pseudodefs.h"
#include "tier0/tslist.h"
#include "tier0/memstd.h"
#include "tier0/basetypes.h"
#include "tier1/cvar.h"
#include "tier2/renderutils.h"
@ -102,7 +102,7 @@ void DestroyOverlay(OverlayBase_t* pOverlay)
goto LABEL_MALLOC;
LABEL_MALLOC:
pOverlay->m_Type = OverlayType_t::OVERLAY_UNK1;
v_MemAlloc_Internal(pOverlay, pOverlaySize);
MemAllocSingleton()->Free(pOverlay);
break;
default:
break;
@ -253,11 +253,6 @@ void DrawAIScriptNodes()
for (int i = ai_script_nodes_draw_index->GetInt(); i < (*g_pAINetwork)->GetNumScriptNodes(); i++)
{
if (i < 0)
{
return;
}
vTransforms.xmm[0] = _mm_set_ps((*g_pAINetwork)->m_ScriptNode[i].m_vOrigin.x - 50.f, 0.0f, 0.0f, 1.0f);
vTransforms.xmm[1] = _mm_set_ps((*g_pAINetwork)->m_ScriptNode[i].m_vOrigin.y - 50.f, 0.0f, 1.0f, 0.0f);
vTransforms.xmm[2] = _mm_set_ps((*g_pAINetwork)->m_ScriptNode[i].m_vOrigin.z - 50.f, 1.0f, 0.0f, 0.0f);
@ -386,6 +381,9 @@ static void DrawNavMeshPortals()
}
}
//------------------------------------------------------------------------------
// Purpose : draw NavMesh polys
//------------------------------------------------------------------------------
void DrawNavMeshPolys()
{
const dtNavMesh* mesh = GetNavMeshForHull(navmesh_debug_type->GetInt());
@ -452,7 +450,10 @@ void DrawNavMeshPolys()
}
}
static void DrawNavMeshPolyBoundaries()
//------------------------------------------------------------------------------
// Purpose : draw NavMesh poly boundaries
//------------------------------------------------------------------------------
void DrawNavMeshPolyBoundaries()
{
static const float thr = 0.01f * 0.01f;
Color col{20, 140, 255, 255};
@ -556,7 +557,7 @@ void DrawAllOverlays(bool bDraw)
return;
EnterCriticalSection(&*s_OverlayMutex);
#ifndef CLIENT_DLL
if (ai_script_nodes_draw->GetBool())
if (ai_script_nodes_draw->GetInt() > -1)
DrawAIScriptNodes();
if (navmesh_draw_bvtree->GetInt() > -1)
DrawNavMeshBVTree();

68
r5dev/tier0/memstd.h Normal file
View File

@ -0,0 +1,68 @@
#ifndef MEMSTD_H
#define MEMSTD_H
class IMemAlloc
{
public:
template<typename T>
T* Alloc(size_t nSize)
{
const int index = 1;
return CallVFunc<T*>(index, this, nSize);
}
template<typename T>
void Free(T* pMem)
{
const int index = 4;
CallVFunc<void>(index, this, pMem);
}
};
//-----------------------------------------------------------------------------
//
//-----------------------------------------------------------------------------
class CStdMemAlloc : public IMemAlloc{};
inline CMemory p_CreateGlobalMemAlloc;
inline auto v_CreateGlobalMemAlloc = p_CreateGlobalMemAlloc.RCast<CStdMemAlloc* (*)(void)>();
inline CStdMemAlloc** g_pMemAllocSingleton = nullptr;
inline CStdMemAlloc* MemAllocSingleton()
{
if (!(*g_pMemAllocSingleton))
{
(*g_pMemAllocSingleton) = v_CreateGlobalMemAlloc();
}
return (*g_pMemAllocSingleton);
}
///////////////////////////////////////////////////////////////////////////////
class VMemStd : public IDetour
{
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: CreateGlobalMemAlloc : {:#18x} |\n", p_CreateGlobalMemAlloc.GetPtr());
spdlog::debug("| VAR: g_pMemAllocSingleton : {:#18x} |\n", reinterpret_cast<uintptr_t>(g_pMemAllocSingleton));
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
p_CreateGlobalMemAlloc = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\xBB\x00\x00\x00\x00\x33\xC0"), "xxxxxxx????xx");
v_CreateGlobalMemAlloc = p_CreateGlobalMemAlloc.RCast<CStdMemAlloc* (*)(void)>(); /*40 53 48 83 EC 20 BB ?? ?? ?? ?? 33 C0*/
}
virtual void GetVar(void) const
{
g_pMemAllocSingleton = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x48\x89\x5C\x24\x00\x57\x48\x81\xEC\x00\x00\x00\x00\x41\x8B\xD8"),
"xxxx?xxxx????xxx").OffsetSelf(0x5A).FindPatternSelf("48 8B", CMemory::Direction::DOWN, 100).ResolveRelativeAddressSelf(0x3, 0x7).RCast<CStdMemAlloc**>();
}
virtual void GetCon(void) const { }
virtual void Attach(void) const { }
virtual void Detach(void) const { }
};
///////////////////////////////////////////////////////////////////////////////
REGISTER(VMemStd);
#endif // MEMSTD_H

17
r5dev/tier0/tslist.cpp
View File

@ -1,17 +0,0 @@
#include "core/stdafx.h"
#include "tier0/tslist.h"
void* MemAlloc_Internal(void* pPool, size_t nSize)
{
return v_MemAlloc_Internal(pPool, nSize);
}
void TSList_Attach()
{
DetourAttach((LPVOID*)&v_MemAlloc_Internal, &MemAlloc_Internal);
}
void TSList_Detach()
{
DetourDetach((LPVOID*)&v_MemAlloc_Internal, &MemAlloc_Internal);
}

29
r5dev/tier0/tslist.h
View File

@ -1,15 +1,6 @@
#ifndef TSLIST_H
#define TSLIST_H
inline CMemory p_MemAlloc_Internal;
inline auto v_MemAlloc_Internal = p_MemAlloc_Internal.RCast<void* (*)(void* pPool, size_t nSize)>();
inline CMemory p_MemAlloc_Wrapper;
inline auto v_MemAlloc_Wrapper = p_MemAlloc_Wrapper.RCast<void* (*)(size_t nSize)>();
inline CMemory p_CTSListBase_Wrapper;
inline auto CTSListBase_Wrapper = p_CTSListBase_Wrapper.RCast<void* (*)(void)>();
inline CMemory g_pMallocPool;
void TSList_Attach();
@ -19,28 +10,10 @@ class VTSListBase : public IDetour
{
virtual void GetAdr(void) const
{
spdlog::debug("| FUN: MemAlloc_Internal : {:#18x} |\n", p_MemAlloc_Internal.GetPtr());
spdlog::debug("| FUN: MemAlloc_Wrapper : {:#18x} |\n", p_MemAlloc_Wrapper.GetPtr());
spdlog::debug("| FUN: CTSListBase_Wrapper : {:#18x} |\n", p_CTSListBase_Wrapper.GetPtr());
spdlog::debug("| VAR: g_pMallocPool : {:#18x} |\n", g_pMallocPool.GetPtr());
spdlog::debug("+----------------------------------------------------------------+\n");
}
virtual void GetFun(void) const
{
p_MemAlloc_Internal = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\xE9\x00\x00\x00\x00\xCC\xCC\xCC\x40\x53\x48\x83\xEC\x20\x48\x8D\x05\x00\x00\x00\x00"), "x????xxxxxxxxxxxx????");
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)
p_MemAlloc_Wrapper = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\x48\x8B\x05\x00\x00\x00\x00\x48\x8B\xD9\x48\x85\xC0\x75\x0C\xE8\x16"), "xxxxxxxxx????xxxxxxxxxx");
#elif defined (GAMEDLL_S2)
p_MemAlloc_Wrapper = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\x48\x8B\x05\x00\x00\x00\x00\x48\x8B\xD9\x48\x85\xC0\x75\x0C\xE8\x00\x00\x00\x00\x48\x89\x05\x00\x00\x00\x00\x4C\x8B\x00\x48\x8B\xD3\x48\x8B\xC8\x48\x83\xC4\x20\x5B\x49\xFF\x60\x08"), "xxxxxxxxx????xxxxxxxxx????xxx????xxxxxxxxxxxxxxxxxx");
#elif defined (GAMEDLL_S3)
p_MemAlloc_Wrapper = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\x48\x8B\x05\x6B\x83\x25\x0D\x48\x8B\xD9"), "xxxxxxxxxxxxxxxx");
#endif
p_CTSListBase_Wrapper = g_mGameDll.FindPatternSIMD(reinterpret_cast<rsig_t>("\x40\x53\x48\x83\xEC\x20\xBB\x00\x00\x00\x00\x33\xC0"), "xxxxxxx????xx");
CTSListBase_Wrapper = p_CTSListBase_Wrapper.RCast<void* (*)(void)>(); /*40 53 48 83 EC 20 BB ?? ?? ?? ?? 33 C0*/
v_MemAlloc_Wrapper = p_MemAlloc_Wrapper.RCast<void* (*)(size_t)>(); /*40 53 48 83 EC 20 48 8B 05 6B 83 25 0D 48 8B D9*/
v_MemAlloc_Internal = p_MemAlloc_Internal.RCast<void* (*)(void*, size_t)>(); /*E9 ?? ?? ?? ?? CC CC CC 40 53 48 83 EC 20 48 8D 05 ?? ?? ?? ??*/
}
virtual void GetFun(void) const { }
virtual void GetVar(void) const
{
#if defined (GAMEDLL_S0) || defined (GAMEDLL_S1)

19
r5dev/tier1/IConVar.cpp
View File

@ -6,6 +6,7 @@
#include "core/stdafx.h"
#include "tier0/tslist.h"
#include "tier0/memstd.h"
#include "tier1/IConVar.h"
#include "tier1/cvar.h"
#include "mathlib/bits.h"
@ -16,8 +17,8 @@
//-----------------------------------------------------------------------------
ConVar::ConVar(const char* pszName, const char* pszDefaultValue, int nFlags, const char* pszHelpString, bool bMin, float fMin, bool bMax, float fMax, void* pCallback, const char* pszUsageString)
{
ConVar* pNewConVar = reinterpret_cast<ConVar*>(v_MemAlloc_Wrapper(sizeof(ConVar))); // Allocate new memory with StdMemAlloc else we crash.
memset(pNewConVar, '\0', sizeof(ConVar)); // Set all to null.
ConVar* pNewConVar = MemAllocSingleton()->Alloc<ConVar>(sizeof(ConVar)); // Allocate new memory with StdMemAlloc else we crash.
memset(pNewConVar, '\0', sizeof(ConVar)); // Set all to null.
pNewConVar->m_pConCommandBaseVTable = g_pConVarVtable.RCast<void*>();
pNewConVar->m_pIConVarVTable = g_pIConVarVtable.RCast<void*>();
@ -31,6 +32,11 @@ ConVar::ConVar(const char* pszName, const char* pszDefaultValue, int nFlags, con
//-----------------------------------------------------------------------------
ConVar::~ConVar(void)
{
if (m_Value.m_pszString)
{
MemAllocSingleton()->Free(m_Value.m_pszString);
m_Value.m_pszString = NULL;
}
}
//-----------------------------------------------------------------------------
@ -204,6 +210,9 @@ void ConVar::InitShipped(void) const
host_hasIrreversibleShutdown = g_pCVar->FindVar("host_hasIrreversibleShutdown");
net_usesocketsforloopback = g_pCVar->FindVar("net_usesocketsforloopback");
#ifndef CLIENT_DLL
ai_script_nodes_draw->SetValue(-1);
#endif // !CLIENT_DLL
mp_gamemode->SetCallback(&MP_GameMode_Changed_f);
}
@ -745,15 +754,15 @@ void ConVar::ChangeStringValue(const char* pszTempVal, float flOldValue)
{
if (m_Value.m_pszString)
{
delete[] m_Value.m_pszString;
MemAllocSingleton()->Free(m_Value.m_pszString);
}
m_Value.m_pszString = new char[len];
m_Value.m_pszString = MemAllocSingleton()->Alloc<const char>(len);
m_Value.m_iStringLength = len;
}
else if (!m_Value.m_pszString)
{
m_Value.m_pszString = new char[len];
m_Value.m_pszString = MemAllocSingleton()->Alloc<const char>(len);
m_Value.m_iStringLength = len;
}
memcpy(const_cast<char*>(m_Value.m_pszString), pszTempVal, len);

5
r5dev/tier1/cmd.cpp
View File

@ -6,6 +6,7 @@
#include "core/stdafx.h"
#include "tier0/tslist.h"
#include "tier0/memstd.h"
#include "tier1/cmd.h"
#include "tier1/cvar.h"
#include "vstdlib/callback.h"
@ -97,8 +98,8 @@ bool CCommand::HasOnlyDigits(int nIndex) const
//-----------------------------------------------------------------------------
ConCommand::ConCommand(const char* pszName, const char* pszHelpString, int nFlags, void* pCallback, void* pCommandCompletionCallback)
{
ConCommand* pCommand = reinterpret_cast<ConCommand*>(v_MemAlloc_Wrapper(sizeof(ConCommand))); // Allocate new memory with StdMemAlloc else we crash.
memset(pCommand, '\0', sizeof(ConCommand)); // Set all to null.
ConCommand* pCommand = MemAllocSingleton()->Alloc<ConCommand>(sizeof(ConCommand));
memset(pCommand, '\0', sizeof(ConCommand));
pCommand->m_pConCommandBaseVTable = g_pConCommandVtable.RCast<void*>();
pCommand->m_pszName = pszName;

2
r5dev/vproj/clientsdk.vcxproj
View File

@ -105,7 +105,6 @@
<ClCompile Include="..\tier0\jobthread.cpp" />
<ClCompile Include="..\tier0\platform.cpp" />
<ClCompile Include="..\tier0\threadtools.cpp" />
<ClCompile Include="..\tier0\tslist.cpp" />
<ClCompile Include="..\tier1\bitbuf.cpp" />
<ClCompile Include="..\tier1\cmd.cpp" />
<ClCompile Include="..\tier1\cvar.cpp" />
@ -447,6 +446,7 @@
<ClInclude Include="..\tier0\fasttimer.h" />
<ClInclude Include="..\tier0\interface.h" />
<ClInclude Include="..\tier0\jobthread.h" />
<ClInclude Include="..\tier0\memstd.h" />
<ClInclude Include="..\tier0\platform.h" />
<ClInclude Include="..\tier0\platform_internal.h" />
<ClInclude Include="..\tier0\threadtools.h" />

6
r5dev/vproj/clientsdk.vcxproj.filters
View File

@ -477,9 +477,6 @@
<ClCompile Include="..\engine\clockdriftmgr.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="..\tier0\tslist.cpp">
<Filter>sdk\tier0</Filter>
</ClCompile>
<ClCompile Include="..\engine\client\client.cpp">
<Filter>sdk\engine\client</Filter>
</ClCompile>
@ -1613,6 +1610,9 @@
<ClInclude Include="..\public\include\idebugoverlay.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\tier0\memstd.h">
<Filter>sdk\tier0</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">

2
r5dev/vproj/dedicated.vcxproj
View File

@ -418,6 +418,7 @@
<ClInclude Include="..\tier0\fasttimer.h" />
<ClInclude Include="..\tier0\interface.h" />
<ClInclude Include="..\tier0\jobthread.h" />
<ClInclude Include="..\tier0\memstd.h" />
<ClInclude Include="..\tier0\platform.h" />
<ClInclude Include="..\tier0\platform_internal.h" />
<ClInclude Include="..\tier0\threadtools.h" />
@ -539,7 +540,6 @@
<ClCompile Include="..\tier0\jobthread.cpp" />
<ClCompile Include="..\tier0\platform.cpp" />
<ClCompile Include="..\tier0\threadtools.cpp" />
<ClCompile Include="..\tier0\tslist.cpp" />
<ClCompile Include="..\tier1\bitbuf.cpp" />
<ClCompile Include="..\tier1\cmd.cpp" />
<ClCompile Include="..\tier1\cvar.cpp" />

6
r5dev/vproj/dedicated.vcxproj.filters
View File

@ -1170,6 +1170,9 @@
<ClInclude Include="..\server\persistence.h">
<Filter>sdk\server</Filter>
</ClInclude>
<ClInclude Include="..\tier0\memstd.h">
<Filter>sdk\tier0</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\common\opcodes.cpp">
@ -1394,9 +1397,6 @@
<ClCompile Include="..\engine\clockdriftmgr.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="..\tier0\tslist.cpp">
<Filter>sdk\tier0</Filter>
</ClCompile>
<ClCompile Include="..\engine\client\client.cpp">
<Filter>sdk\engine\client</Filter>
</ClCompile>

2
r5dev/vproj/gamesdk.vcxproj
View File

@ -114,7 +114,6 @@
<ClCompile Include="..\tier0\jobthread.cpp" />
<ClCompile Include="..\tier0\platform.cpp" />
<ClCompile Include="..\tier0\threadtools.cpp" />
<ClCompile Include="..\tier0\tslist.cpp" />
<ClCompile Include="..\tier1\bitbuf.cpp" />
<ClCompile Include="..\tier1\cmd.cpp" />
<ClCompile Include="..\tier1\cvar.cpp" />
@ -472,6 +471,7 @@
<ClInclude Include="..\tier0\dbgflag.h" />
<ClInclude Include="..\tier0\fasttimer.h" />
<ClInclude Include="..\tier0\jobthread.h" />
<ClInclude Include="..\tier0\memstd.h" />
<ClInclude Include="..\tier0\platform.h" />
<ClInclude Include="..\tier0\platform_internal.h" />
<ClInclude Include="..\tier0\threadtools.h" />

6
r5dev/vproj/gamesdk.vcxproj.filters
View File

@ -504,9 +504,6 @@
<ClCompile Include="..\engine\clockdriftmgr.cpp">
<Filter>sdk\engine</Filter>
</ClCompile>
<ClCompile Include="..\tier0\tslist.cpp">
<Filter>sdk\tier0</Filter>
</ClCompile>
<ClCompile Include="..\engine\server\sv_main.cpp">
<Filter>sdk\engine\server</Filter>
</ClCompile>
@ -1697,6 +1694,9 @@
<ClInclude Include="..\public\include\idebugoverlay.h">
<Filter>sdk\public\include</Filter>
</ClInclude>
<ClInclude Include="..\tier0\memstd.h">
<Filter>sdk\tier0</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="..\shared\resource\lockedserver.png">