Proof-of-concept support of thiscall

yegord · Jun 9, 2015 · 50bffeb · 50bffeb
1 parent e9705fa
commit 50bffeb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/nc/arch/x86/CallingConventions.cpp b/src/nc/arch/x86/CallingConventions.cpp
@@ -103,6 +103,9 @@ Cdecl32CallingConvention::Cdecl32CallingConvention(const X86Architecture *archit
     setFirstArgumentOffset(architecture->bitness());
     setArgumentAlignment(architecture->bitness());
 
+    addArgumentGroup(std::vector<core::ir::MemoryLocation>(1, X86Registers::ecx()->memoryLocation()));
+    addArgumentGroup(std::vector<core::ir::MemoryLocation>());
+
     addReturnValueLocation(X86Registers::eax()->memoryLocation());
     addReturnValueLocation(X86Registers::st0()->memoryLocation());
 
@@ -146,6 +149,9 @@ Stdcall32CallingConvention::Stdcall32CallingConvention(const X86Architecture *ar
     setArgumentAlignment(architecture->bitness());
     setCalleeCleanup(true);
 
+    addArgumentGroup(std::vector<core::ir::MemoryLocation>(1, X86Registers::ecx()->memoryLocation()));
+    addArgumentGroup(std::vector<core::ir::MemoryLocation>());
+
     addReturnValueLocation(X86Registers::ax()->memoryLocation());
     addReturnValueLocation(X86Registers::st0()->memoryLocation());
 

diff --git a/src/nc/arch/x86/CallingConventions.h b/src/nc/arch/x86/CallingConventions.h
@@ -57,6 +57,7 @@ class Microsoft64CallingConvention: public core::ir::calling::Convention {
 
 /**
  * 32-bit cdecl calling convention.
+ * Tweaked to allow passing one argument via ecx (like in thiscall).
  */
 class Cdecl32CallingConvention: public core::ir::calling::Convention {
 public:
@@ -79,6 +80,7 @@ class Cdecl16CallingConvention: public core::ir::calling::Convention {
 
 /**
  * 32-bit stdcall calling convention.
+ * Tweaked to allow passing one argument via ecx (like in thiscall).
  */
 class Stdcall32CallingConvention: public core::ir::calling::Convention {
 public: