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

Don't use std::list at all in DynamicHooks

Browse Source 
Switch to amtl Vector.
This commit is contained in:
Peace-Maker
2016-12-13 17:37:12 -07:00
parent c70d3b9ee0
commit 6e96e0fb84
13 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DynamicHooks/conventions/x86MsCdecl.cpp
+8 -8
View File
@@ -38,7 +38,7 @@
// ============================================================================
// >> x86MsCdecl
// ============================================================================
x86MsCdecl::x86MsCdecl(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
x86MsCdecl::x86MsCdecl(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
ICallingConvention(vecArgTypes, returnType, iAlignment)
{
if (m_returnType.size > 4)
@@ -59,22 +59,22 @@ x86MsCdecl::~x86MsCdecl()
}
}
std::list<Register_t> x86MsCdecl::GetRegisters()
ke::Vector<Register_t> x86MsCdecl::GetRegisters()
{
std::list<Register_t> registers;
ke::Vector<Register_t> registers;
registers.push_back(ESP);
registers.append(ESP);
if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
{
registers.push_back(ST0);
registers.append(ST0);
}
else
{
registers.push_back(EAX);
registers.append(EAX);
if (m_pReturnBuffer)
{
registers.push_back(EDX);
registers.append(EDX);
}
}
@@ -90,7 +90,7 @@ int x86MsCdecl::GetArgStackSize()
{
int iArgStackSize = 0;
for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
for (unsigned int i = 0; i < m_vecArgTypes.length(); i++)
{
iArgStackSize += m_vecArgTypes[i].size;
}
DynamicHooks/conventions/x86MsCdecl.h
+2 -2
View File
@@ -63,10 +63,10 @@ Return values:
class x86MsCdecl: public ICallingConvention
{
public:
x86MsCdecl(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
x86MsCdecl(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
~x86MsCdecl();
virtual std::list<Register_t> GetRegisters();
virtual ke::Vector<Register_t> GetRegisters();
virtual int GetPopSize();
virtual int GetArgStackSize();
virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
DynamicHooks/conventions/x86MsStdcall.cpp
+9 -9
View File
@@ -38,7 +38,7 @@
// ============================================================================
// >> x86MsStdcall
// ============================================================================
x86MsStdcall::x86MsStdcall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
x86MsStdcall::x86MsStdcall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
ICallingConvention(vecArgTypes, returnType, iAlignment)
{
if (m_returnType.size > 4)
@@ -59,22 +59,22 @@ x86MsStdcall::~x86MsStdcall()
}
}
std::list<Register_t> x86MsStdcall::GetRegisters()
ke::Vector<Register_t> x86MsStdcall::GetRegisters()
{
std::list<Register_t> registers;
ke::Vector<Register_t> registers;
registers.push_back(ESP);
registers.append(ESP);
if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
{
registers.push_back(ST0);
registers.append(ST0);
}
else
{
registers.push_back(EAX);
registers.append(EAX);
if (m_pReturnBuffer)
{
registers.push_back(EDX);
registers.append(EDX);
}
}
@@ -85,7 +85,7 @@ int x86MsStdcall::GetPopSize()
{
int iPopSize = 0;
for(unsigned int i=0; i < m_vecArgTypes.size(); i++)
for(unsigned int i=0; i < m_vecArgTypes.length(); i++)
{
iPopSize += m_vecArgTypes[i].size;
}
@@ -97,7 +97,7 @@ int x86MsStdcall::GetArgStackSize()
{
int iArgStackSize = 0;
for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
for (unsigned int i = 0; i < m_vecArgTypes.length(); i++)
{
iArgStackSize += m_vecArgTypes[i].size;
}
DynamicHooks/conventions/x86MsStdcall.h
+2 -2
View File
@@ -63,10 +63,10 @@ Return values:
class x86MsStdcall: public ICallingConvention
{
public:
x86MsStdcall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
x86MsStdcall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
~x86MsStdcall();
virtual std::list<Register_t> GetRegisters();
virtual ke::Vector<Register_t> GetRegisters();
virtual int GetPopSize();
virtual int GetArgStackSize();
virtual void** GetStackArgumentPtr(CRegisters* pRegisters);
DynamicHooks/conventions/x86MsThiscall.cpp
+11 -11
View File
@@ -38,7 +38,7 @@
// ============================================================================
// >> x86MsThiscall
// ============================================================================
x86MsThiscall::x86MsThiscall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
x86MsThiscall::x86MsThiscall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment) :
ICallingConvention(vecArgTypes, returnType, iAlignment)
{
if (m_returnType.size > 4)
@@ -59,23 +59,23 @@ x86MsThiscall::~x86MsThiscall()
}
}
std::list<Register_t> x86MsThiscall::GetRegisters()
ke::Vector<Register_t> x86MsThiscall::GetRegisters()
{
std::list<Register_t> registers;
ke::Vector<Register_t> registers;
registers.push_back(ESP);
registers.push_back(ECX);
registers.append(ESP);
registers.append(ECX);
if (m_returnType.type == DATA_TYPE_FLOAT || m_returnType.type == DATA_TYPE_DOUBLE)
{
registers.push_back(ST0);
registers.append(ST0);
}
else
{
registers.push_back(EAX);
registers.append(EAX);
if (m_pReturnBuffer)
{
registers.push_back(EDX);
registers.append(EDX);
}
}
@@ -89,7 +89,7 @@ int x86MsThiscall::GetPopSize()
//int iPopSize = GetDataTypeSize(DATA_TYPE_POINTER, m_iAlignment);
int iPopSize = 0;
for(unsigned int i=0; i < m_vecArgTypes.size(); i++)
for(unsigned int i=0; i < m_vecArgTypes.length(); i++)
{
iPopSize += m_vecArgTypes[i].size;
}
@@ -101,7 +101,7 @@ int x86MsThiscall::GetArgStackSize()
{
int iArgStackSize = 0;
for (unsigned int i = 0; i < m_vecArgTypes.size(); i++)
for (unsigned int i = 0; i < m_vecArgTypes.length(); i++)
{
iArgStackSize += m_vecArgTypes[i].size;
}
@@ -158,4 +158,4 @@ void x86MsThiscall::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
}
}
}
DynamicHooks/conventions/x86MsThiscall.h
+2 -2
View File
@@ -64,10 +64,10 @@ Return values:
class x86MsThiscall: public ICallingConvention
{
public:
x86MsThiscall(std::vector<DataTypeSized_t> vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
x86MsThiscall(ke::Vector<DataTypeSized_t> &vecArgTypes, DataTypeSized_t returnType, int iAlignment=4);
~x86MsThiscall();
virtual std::list<Register_t> GetRegisters();
virtual ke::Vector<Register_t> GetRegisters();
virtual int GetPopSize();
virtual int x86MsThiscall::GetArgStackSize();
virtual void** GetStackArgumentPtr(CRegisters* pRegisters);