ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1190 from comex/stackalign 

Remove useless STACKALIGN macro.
This commit is contained in:
comex 2014-09-30 01:54:38 -04:00
parent ac1f9f950f 2eebdff01b
commit 4edc7fbf85
8 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Common/Common.h
View File

@ -56,8 +56,6 @@ extern const char *netplay_dolphin_ver;
#endif #endif
#endif #endif
#define STACKALIGN
// An inheritable class to disallow the copy constructor and operator= functions // An inheritable class to disallow the copy constructor and operator= functions
class NonCopyable class NonCopyable
{ {
@ -70,15 +68,7 @@ private:
NonCopyable& operator=(NonCopyable& other); NonCopyable& operator=(NonCopyable& other);
}; };
#ifdef __APPLE__ #if defined _WIN32
// The Darwin ABI requires that stack frames be aligned to 16-byte boundaries.
// This is only needed on i386 gcc - x86_64 already aligns to 16 bytes.
#if defined __i386__ && defined __GNUC__
#undef STACKALIGN
#define STACKALIGN __attribute__((__force_align_arg_pointer__))
#endif
#elif defined _WIN32
// Memory leak checks // Memory leak checks
#define CHECK_HEAP_INTEGRITY() #define CHECK_HEAP_INTEGRITY()

2
Source/Core/Core/HW/GPFifo.cpp
View File

@ -55,7 +55,7 @@ void ResetGatherPipe()
m_gatherPipeCount = 0; m_gatherPipeCount = 0;
} }
void STACKALIGN CheckGatherPipe() void CheckGatherPipe()
{ {
if (m_gatherPipeCount >= GATHER_PIPE_SIZE) if (m_gatherPipeCount >= GATHER_PIPE_SIZE)
{ {

4
Source/Core/Core/PowerPC/Jit64/Jit.cpp
View File

@ -463,7 +463,7 @@ void Jit64::WriteExternalExceptionExit()
JMP(asm_routines.dispatcher, true); JMP(asm_routines.dispatcher, true);
} }
void STACKALIGN Jit64::Run() void Jit64::Run()
{ {
CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
pExecAddr(); pExecAddr();
@ -498,7 +498,7 @@ void Jit64::Trace()
PC, SRR0, SRR1, PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str()); PC, SRR0, SRR1, PowerPC::ppcState.fpscr, PowerPC::ppcState.msr, PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str());
} }
void STACKALIGN Jit64::Jit(u32 em_address) void Jit64::Jit(u32 em_address)
{ {
if (GetSpaceLeft() < 0x10000 || if (GetSpaceLeft() < 0x10000 ||
farcode.GetSpaceLeft() < 0x10000 || farcode.GetSpaceLeft() < 0x10000 ||

4
Source/Core/Core/PowerPC/Jit64IL/JitIL.cpp
View File

@ -463,7 +463,7 @@ void JitIL::WriteExceptionExit()
JMP(asm_routines.dispatcher, true); JMP(asm_routines.dispatcher, true);
} }
void STACKALIGN JitIL::Run() void JitIL::Run()
{ {
CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
pExecAddr(); pExecAddr();
@ -502,7 +502,7 @@ void JitIL::Trace()
PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str()); PowerPC::ppcState.spr[8], regs.c_str(), fregs.c_str());
} }
void STACKALIGN JitIL::Jit(u32 em_address) void JitIL::Jit(u32 em_address)
{ {
if (GetSpaceLeft() < 0x10000 || farcode.GetSpaceLeft() < 0x10000 || blocks.IsFull() || if (GetSpaceLeft() < 0x10000 || farcode.GetSpaceLeft() < 0x10000 || blocks.IsFull() ||
SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache) SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache)

4
Source/Core/Core/PowerPC/JitArm32/Jit.cpp
View File

@ -220,7 +220,7 @@ void JitArm::WriteExit(u32 destination)
b->linkData.push_back(linkData); b->linkData.push_back(linkData);
} }
void STACKALIGN JitArm::Run() void JitArm::Run()
{ {
CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
pExecAddr(); pExecAddr();
@ -282,7 +282,7 @@ void JitArm::PrintDebug(UGeckoInstruction inst, u32 level)
} }
} }
void STACKALIGN JitArm::Jit(u32 em_address) void JitArm::Jit(u32 em_address)
{ {
if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache) if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache)
{ {

4
Source/Core/Core/PowerPC/JitArm64/Jit.cpp
View File

@ -151,7 +151,7 @@ void JitArm64::WriteExitDestInR(ARM64Reg Reg)
BR(EncodeRegTo64(Reg)); BR(EncodeRegTo64(Reg));
} }
void STACKALIGN JitArm64::Run() void JitArm64::Run()
{ {
CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode; CompiledCode pExecAddr = (CompiledCode)asm_routines.enterCode;
pExecAddr(); pExecAddr();
@ -163,7 +163,7 @@ void JitArm64::SingleStep()
pExecAddr(); pExecAddr();
} }
void STACKALIGN JitArm64::Jit(u32 em_address) void JitArm64::Jit(u32 em_address)
{ {
if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache) if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().m_LocalCoreStartupParameter.bJITNoBlockCache)
{ {

2
Source/Core/VideoBackends/Software/SWCommandProcessor.cpp
View File

@ -174,7 +174,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
); );
} }
void STACKALIGN GatherPipeBursted() void GatherPipeBursted()
{ {
if (cpreg.ctrl.GPLinkEnable) if (cpreg.ctrl.GPLinkEnable)
{ {

2
Source/Core/VideoCommon/CommandProcessor.cpp
View File

@ -302,7 +302,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base)
); );
} }
void STACKALIGN GatherPipeBursted() void GatherPipeBursted()
{ {
ProcessFifoEvents(); ProcessFifoEvents();
// if we aren't linked, we don't care about gather pipe data // if we aren't linked, we don't care about gather pipe data