Add Fastcall calling convention. (#348)

* Added Fastcall convention.

* Minor fix.

* Removed x86MsFastcall.cpp from DynamicHooks.

Author: CookStar

src/core/modules/memory/memory_function.cpp

@@ -40,6 +40,7 @@
 #include "conventions/x86MsCdecl.h"
 #include "conventions/x86MsThiscall.h"
 #include "conventions/x86MsStdcall.h"
+#include "conventions/x86MsFastcall.h"
 #include "conventions/x86GccCdecl.h"
 #include "conventions/x86GccThiscall.h"
 
@@ -76,6 +77,7 @@ int GetDynCallConvention(Convention_t eConv)
 			#endif
 #ifdef _WIN32
 		case CONV_STDCALL: return DC_CALL_C_X86_WIN32_STD;
+		case CONV_FASTCALL: return DC_CALL_C_X86_WIN32_FAST_MS;
 #endif
 	}
 
@@ -95,6 +97,7 @@ ICallingConvention* MakeDynamicHooksConvention(Convention_t eConv, std::vector<D
 	case CONV_CDECL: return new x86MsCdecl(vecArgTypes, returnType, iAlignment);
 	case CONV_THISCALL: return new x86MsThiscall(vecArgTypes, returnType, iAlignment);
 	case CONV_STDCALL: return new x86MsStdcall(vecArgTypes, returnType, iAlignment);
+	case CONV_FASTCALL: return new x86MsFastcall(vecArgTypes, returnType, iAlignment);
 	}
 #else
 	switch (eConv)

src/core/modules/memory/memory_function.h

@@ -45,7 +45,8 @@ enum Convention_t
 	CONV_CUSTOM,
 	CONV_CDECL,
 	CONV_THISCALL,
-	CONV_STDCALL
+	CONV_STDCALL,
+	CONV_FASTCALL
 };
 
 

src/core/modules/memory/memory_wrap.cpp

@@ -585,6 +585,7 @@ void export_convention_t(scope _memory)
 		.value("CDECL", CONV_CDECL)
 		.value("STDCALL", CONV_STDCALL)
 		.value("THISCALL", CONV_THISCALL)
+		.value("FASTCALL", CONV_FASTCALL)
 	;
 }
 

src/thirdparty/DynamicHooks/include/conventions/x86MsFastcall.h

@@ -0,0 +1,83 @@
+/**
+* =============================================================================
+* 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).
+*/
+
+#ifndef _X86_MS_FASTCALL_H
+#define _X86_MS_FASTCALL_H
+
+// ============================================================================
+// >> INCLUDES
+// ============================================================================
+#include "../convention.h"
+
+
+// ============================================================================
+// >> CLASSES
+// ============================================================================
+/*
+Source: DynCall manual and Windows docs
+
+Registers:
+	- eax = return value
+	- ecx = parameter 0
+	- edx = parameter 1, return value
+	- esp = stack pointer
+	- st0 = floating point return value
+
+Parameter passing:
+	- stack parameter order: right-to-left
+	- callee cleans up the stack
+	- all other arguments are pushed onto the stack
+	- alignment: 4 bytes
+
+Return values:
+	- return values of pointer or intergral type (<= 32 bits) are returned via the eax register
+	- integers > 32 bits are returned via the eax and edx registers
+	- floating pointer types are returned via the st0 register
+*/
+class x86MsFastcall: public ICallingConvention
+{	
+public:
+	x86MsFastcall(std::vector<DataType_t> vecArgTypes, DataType_t returnType, int iAlignment=4);
+	~x86MsFastcall();
+
+	virtual std::list<Register_t> GetRegisters();
+	virtual int GetPopSize();
+	
+	virtual void* GetArgumentPtr(int iIndex, CRegisters* pRegisters);
+	virtual void ArgumentPtrChanged(int iIndex, CRegisters* pRegisters, void* pArgumentPtr);
+
+	virtual void* GetReturnPtr(CRegisters* pRegisters);
+	virtual void ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr);
+
+private:
+	void* m_pReturnBuffer;
+};
+
+#endif // _X86_MS_FASTCALL_H