UNLOZE/sm-ext-dhooks2
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix |thiscall| on linux for functions with arguments

Browse Source 
The previous fix messed up parameter getters and setters.
This commit is contained in:
Peace-Maker 2018-06-02 13:36:52 +02:00
parent 0d24200a49
commit 9da7e666f6
5 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AMBuildScript
View File

@ -270,9 +270,13 @@ program.sources += [
os.path.join('DynamicHooks', 'utilities.cpp'),
os.path.join('DynamicHooks', 'conventions', 'x86MsCdecl.cpp'),
os.path.join('DynamicHooks', 'conventions', 'x86MsStdcall.cpp'),
os.path.join('DynamicHooks', 'conventions', 'x86MsThiscall.cpp'),
]
if builder.target_platform == 'windows':
program.sources += [os.path.join('DynamicHooks', 'conventions', 'x86MsThiscall.cpp')]
else:
program.sources += [os.path.join('DynamicHooks', 'conventions', 'x86GccThiscall.cpp')]
program.sources += [os.path.join(DHooks.sm_root, 'public', 'smsdk_ext.cpp')]
if os.path.isfile(os.path.join(DHooks.sm_root, 'sourcepawn', 'vm', 'x86', 'assembler-x86.cpp')):

66
DynamicHooks/conventions/x86GccThiscall.cpp Normal file
View File

@ -0,0 +1,66 @@
/**
* =============================================================================
* DynamicHooks
* Copyright (C) 2015 Robin Gohmert. All rights reserved.
* =============================================================================
*
* This software is provided 'as-is', without any express or implied warranty.
* In no event will the authors be held liable for any damages arising from
* the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software in a
* product, an acknowledgment in the product documentation would be
* appreciated but is not required.
*
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
*
* 3. This notice may not be removed or altered from any source distribution.
*
* asm.h/cpp from devmaster.net (thanks cybermind) edited by pRED* to handle gcc
* -fPIC thunks correctly
*
* Idea and trampoline code taken from DynDetours (thanks your-name-here).
*/
// ============================================================================
// >> INCLUDES
// ============================================================================
#include "x86GccThiscall.h"
// ============================================================================
// >> CLASSES
// ============================================================================
x86GccThiscall::x86GccThiscall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
x86GccCdecl(vecArgTypes, returnType, iAlignment)
{
// Always add the |this| pointer.
DataTypeSized_t type;
type.type = DATA_TYPE_POINTER;
type.size = GetDataTypeSize(type, iAlignment);
type.custom_register = None;
m_vecArgTypes.insert(0, type);
}
int x86GccThiscall::GetArgStackSize()
{
// Remove the this pointer from the arguments size.
DataTypeSized_t type;
type.type = DATA_TYPE_POINTER;
return x86GccCdecl::GetArgStackSize() - GetDataTypeSize(type, m_iAlignment);
}
void** x86GccThiscall::GetStackArgumentPtr(CRegisters* pRegisters)
{
// Skip return address and this pointer.
DataTypeSized_t type;
type.type = DATA_TYPE_POINTER;
return (void **)(pRegisters->m_esp->GetValue<unsigned long>() + 4 + GetDataTypeSize(type, m_iAlignment));
}

15
DynamicHooks/conventions/x86GccThiscall.h
View File

@ -40,19 +40,14 @@
// ============================================================================
// >> CLASSES
// ============================================================================
// |this| pointer is always passed as implicit first argument on the stack.
class x86GccThiscall: public x86GccCdecl
{
public:
x86GccThiscall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment = 4) :
x86GccCdecl(vecArgTypes, returnType, iAlignment)
{
// Always add the |this| pointer.
DataTypeSized_t type;
type.type = DATA_TYPE_POINTER;
type.size = GetDataTypeSize(type, iAlignment);
type.custom_register = None;
m_vecArgTypes.insert(0, type);
}
x86GccThiscall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment = 4);
virtual int GetArgStackSize();
virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
};
#endif // _X86_GCC_THISCALL_H

1
DynamicHooks/conventions/x86MsCdecl.cpp
View File

@ -142,6 +142,7 @@ void* x86MsCdecl::GetArgumentPtr(unsigned int iIndex, CRegisters* pRegisters)
return pRegister->m_pAddress;
}
// Skip return address.
size_t iOffset = 4;
for(unsigned int i=0; i < iIndex; i++)
{

8
dynhooks_sourcepawn.cpp
View File

@ -2,17 +2,17 @@
#include "util.h"
#include <am-autoptr.h>
#ifdef KE_WINDOWS
#include "conventions/x86MsCdecl.h"
#include "conventions/x86MsThiscall.h"
#include "conventions/x86MsStdcall.h"
#include "conventions/x86GccCdecl.h"
#include "conventions/x86GccThiscall.h"
#ifdef KE_WINDOWS
typedef x86MsCdecl x86DetourCdecl;
typedef x86MsThiscall x86DetourThisCall;
typedef x86MsStdcall x86DetourStdCall;
#elif defined KE_LINUX
#include "conventions/x86GccCdecl.h"
#include "conventions/x86GccThiscall.h"
#include "conventions/x86MsStdcall.h"
typedef x86GccCdecl x86DetourCdecl;
typedef x86GccThiscall x86DetourThisCall;
// Uhm, stdcall on linux?