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

GCC fixes

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

9
sourcehook/sourcehook_hookmangen.cpp
View File

@ -378,6 +378,8 @@ namespace SourceHook
// :TODO: alignment here? // :TODO: alignment here?
// can't use normal alignment methods // can't use normal alignment methods
// because an unknown number of bytes has been pushed already (the other params) // because an unknown number of bytes has been pushed already (the other params)
// save eax
IA32_Push_Reg(&m_HookFunc, REG_EAX); IA32_Push_Reg(&m_HookFunc, REG_EAX);
// compute dest addr to ECX // compute dest addr to ECX
@ -398,6 +400,11 @@ namespace SourceHook
IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EDX, DownCastPtr(pi.pCopyCtor)); IA32_Mov_Reg_Imm32(&m_HookFunc, REG_EDX, DownCastPtr(pi.pCopyCtor));
IA32_Call_Reg(&m_HookFunc, REG_EDX); 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);
// restore eax // restore eax
IA32_Pop_Reg(&m_HookFunc, REG_EAX); IA32_Pop_Reg(&m_HookFunc, REG_EAX);
} }
@ -1883,7 +1890,7 @@ namespace SourceHook
for (int i = 0; i < m_Proto.GetNumOfParams(); ++i) for (int i = 0; i < m_Proto.GetNumOfParams(); ++i)
{ {
IntPassInfo &pi = m_Proto.GetParam(i); IntPassInfo &pi = m_Proto.GetParam(i);
if (pi.type == PassInfo::PassType_Object && if (pi.type == PassInfo::PassType_Object && (pi.flags & PassInfo::PassFlag_ByVal) &&
(pi.flags & PassInfo::PassFlag_ODtor)) (pi.flags & PassInfo::PassFlag_ODtor))
{ {
pi.flags |= PassFlag_ForcedByRef; pi.flags |= PassFlag_ForcedByRef;