rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Fixes: alignment, stack cleanup, memory

Browse Source 
--HG--
branch : hookman_autogen
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/branches/hookman_autogen%40576
This commit is contained in:
Pavol Marko 2007-11-25 00:05:02 +00:00
parent 26ed1c3f0c
commit a4e70c3c99
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcehook/sh_memory.h
View File

@ -41,7 +41,7 @@ namespace LinuxSignal
// We need to align addr down to pagesize on linux
// We assume PAGESIZE is a power of two
# define SH_LALIGN(x) (void*)((intptr_t)(x) & ~(PAGESIZE-1))
# define SH_LALDIF(x) ((intptr_t)(x) & (PAGESIZE-1))
# define SH_LALDIF(x) ((intptr_t)(x) % PAGESIZE)
# else
# error Unsupported OS/Compiler
# endif

24
sourcehook/sourcehook_hookmangen.cpp
View File

@ -243,11 +243,11 @@ namespace SourceHook
void GenContext::CheckAlignmentBeforeCall()
{
#if 0
//#if 0
IA32_Test_Rm_Imm32(&m_HookFunc, REG_ESP, 15, MOD_REG);
IA32_Jump_Cond_Imm8(&m_HookFunc, CC_Z, 1);
IA32_Int3(&m_HookFunc);
#endif
//#endif
}
short GenContext::GetParamsTotalStackSize()
@ -400,10 +400,8 @@ namespace SourceHook
IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EDX, DownCastPtr(pi.pCopyCtor));
IA32_Call_Reg(&m_HookFunc, REG_EDX);
// gcc: pop this ptr off the stack
GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
// pop other params off the stack
IA32_Pop_Reg(&m_HookFunc, REG_EAX);
// gcc: clean up stack
GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
// restore eax
IA32_Pop_Reg(&m_HookFunc, REG_EAX);
@ -573,7 +571,7 @@ namespace SourceHook
IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EAX, DownCastPtr(m_Proto.GetRet().pAssignOperator));
CheckAlignmentBeforeCall();
IA32_Call_Reg(&m_HookFunc, REG_EAX);
GCC_ONLY(IA32_Pop_Reg(&m_HookFunc, REG_ECX));
GCC_ONLY(IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, 2 * SIZE_PTR, MOD_REG));
AlignStackAfterCall(tmpAlign);
}
@ -1006,16 +1004,16 @@ namespace SourceHook
IA32_Call_Reg(&m_HookFunc, REG_EAX);
AlignStackAfterCall(alignBytes);
DestroyParams(v_place_fbrr_base);
SaveRetVal(v_plugin_ret, v_place_for_memret);
// cleanup (gcc only)
// params + thisptr
if (SH_COMP == SH_COMP_GCC)
IA32_Add_Rm_ImmAuto(&m_HookFunc, REG_ESP, caller_clean_bytes + SIZE_PTR, MOD_REG);
DestroyParams(v_place_fbrr_base);
SaveRetVal(v_plugin_ret, v_place_for_memret);
// process meta return:
// prev_res = cur_res
// if (cur_res > status) status = cur_res;
@ -1517,7 +1515,7 @@ namespace SourceHook
{
// vsnprintf
jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR*3 + sizeof(size_t), AlignStack_GCC_ThisOnStack);
jit_int32_t tmpAlign = AlignStackBeforeCall(SIZE_PTR*3 + sizeof(size_t), 0);
// push valist, fmt param, maxsize, buffer
IA32_Push_Reg(&m_HookFunc, REG_EAX);

4
sourcehook/sourcehook_hookmangen.h
View File

@ -89,7 +89,11 @@ namespace SourceHook
memset((void*)newBuf, 0xCC, m_AllocatedSize); // :TODO: remove this !
memcpy((void*)newBuf, (const void*)m_pData, m_Size);
if (m_pData)
{
ms_Allocator.SetRE(reinterpret_cast<void*>(m_pData));
ms_Allocator.SetRW(newBuf);
ms_Allocator.Free(reinterpret_cast<void*>(m_pData));
}
m_pData = newBuf;
}
memcpy((void*)(m_pData + m_Size), (const void*)data, size);