piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ABI_AlignStack/ABI_RestoreStack and the noProlog option to ABI_CallFunctionRR.

Browse Source 
The latter being true was the only case where the former would do
anything, and it was never true.  They became obsolete with x86's
removal.
This commit is contained in:
comex
2014-09-07 14:29:51 -04:00
parent c5c0b36046
commit 4dc090643d
4 changed files with 6 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Source/Core/Common/x64ABI.cpp
View File

@ -10,32 +10,6 @@ using namespace Gen;
// Shared code between Win64 and Unix64 // Shared code between Win64 and Unix64
unsigned int XEmitter::ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog)
{
frameSize = noProlog ? 0x28 : 0;
return frameSize;
}
void XEmitter::ABI_AlignStack(unsigned int frameSize, bool noProlog)
{
unsigned int fillSize = ABI_GetAlignedFrameSize(frameSize, noProlog) - frameSize;
if (fillSize != 0)
{
SUB(64, R(RSP), Imm8(fillSize));
}
}
void XEmitter::ABI_RestoreStack(unsigned int frameSize, bool noProlog)
{
unsigned int alignedSize = ABI_GetAlignedFrameSize(frameSize, noProlog);
if (alignedSize != 0)
{
ADD(64, R(RSP), Imm8(alignedSize));
}
}
void XEmitter::ABI_CalculateFrameSize(u32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp) void XEmitter::ABI_CalculateFrameSize(u32 mask, size_t rsp_alignment, size_t needed_frame_size, size_t* shadowp, size_t* subtractionp, size_t* xmm_offsetp)
{ {
size_t shadow = 0; size_t shadow = 0;
@ -128,7 +102,6 @@ void XEmitter::ABI_PopRegistersAndAdjustStack(u32 mask, size_t rsp_alignment, si
// Common functions // Common functions
void XEmitter::ABI_CallFunction(void *func) void XEmitter::ABI_CallFunction(void *func)
{ {
ABI_AlignStack(0);
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
if (distance >= 0x0000000080000000ULL && if (distance >= 0x0000000080000000ULL &&
distance < 0xFFFFFFFF80000000ULL) distance < 0xFFFFFFFF80000000ULL)
@ -141,12 +114,10 @@ void XEmitter::ABI_CallFunction(void *func)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionC16(void *func, u16 param1) void XEmitter::ABI_CallFunctionC16(void *func, u16 param1)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32((u32)param1)); MOV(32, R(ABI_PARAM1), Imm32((u32)param1));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
if (distance >= 0x0000000080000000ULL && if (distance >= 0x0000000080000000ULL &&
@ -160,12 +131,10 @@ void XEmitter::ABI_CallFunctionC16(void *func, u16 param1)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2) void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(32, R(ABI_PARAM2), Imm32((u32)param2)); MOV(32, R(ABI_PARAM2), Imm32((u32)param2));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -180,12 +149,10 @@ void XEmitter::ABI_CallFunctionCC16(void *func, u32 param1, u16 param2)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionC(void *func, u32 param1) void XEmitter::ABI_CallFunctionC(void *func, u32 param1)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
if (distance >= 0x0000000080000000ULL && if (distance >= 0x0000000080000000ULL &&
@ -199,12 +166,10 @@ void XEmitter::ABI_CallFunctionC(void *func, u32 param1)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2) void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -219,12 +184,10 @@ void XEmitter::ABI_CallFunctionCC(void *func, u32 param1, u32 param2)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCP(void *func, u32 param1, void *param2) void XEmitter::ABI_CallFunctionCP(void *func, u32 param1, void *param2)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(64, R(ABI_PARAM2), Imm64((u64)param2)); MOV(64, R(ABI_PARAM2), Imm64((u64)param2));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -239,12 +202,10 @@ void XEmitter::ABI_CallFunctionCP(void *func, u32 param1, void *param2)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3) void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param3)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
MOV(32, R(ABI_PARAM3), Imm32(param3)); MOV(32, R(ABI_PARAM3), Imm32(param3));
@ -260,12 +221,10 @@ void XEmitter::ABI_CallFunctionCCC(void *func, u32 param1, u32 param2, u32 param
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3) void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *param3)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
MOV(64, R(ABI_PARAM3), Imm64((u64)param3)); MOV(64, R(ABI_PARAM3), Imm64((u64)param3));
@ -281,12 +240,10 @@ void XEmitter::ABI_CallFunctionCCP(void *func, u32 param1, u32 param2, void *par
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4) void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 param3, void *param4)
{ {
ABI_AlignStack(0);
MOV(32, R(ABI_PARAM1), Imm32(param1)); MOV(32, R(ABI_PARAM1), Imm32(param1));
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
MOV(32, R(ABI_PARAM3), Imm32(param3)); MOV(32, R(ABI_PARAM3), Imm32(param3));
@ -303,12 +260,10 @@ void XEmitter::ABI_CallFunctionCCCP(void *func, u32 param1, u32 param2, u32 para
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionPC(void *func, void *param1, u32 param2) void XEmitter::ABI_CallFunctionPC(void *func, void *param1, u32 param2)
{ {
ABI_AlignStack(0);
MOV(64, R(ABI_PARAM1), Imm64((u64)param1)); MOV(64, R(ABI_PARAM1), Imm64((u64)param1));
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -323,12 +278,10 @@ void XEmitter::ABI_CallFunctionPC(void *func, void *param1, u32 param2)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3) void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 param3)
{ {
ABI_AlignStack(0);
MOV(64, R(ABI_PARAM1), Imm64((u64)param1)); MOV(64, R(ABI_PARAM1), Imm64((u64)param1));
MOV(64, R(ABI_PARAM2), Imm64((u64)param2)); MOV(64, R(ABI_PARAM2), Imm64((u64)param2));
MOV(32, R(ABI_PARAM3), Imm32(param3)); MOV(32, R(ABI_PARAM3), Imm32(param3));
@ -344,13 +297,11 @@ void XEmitter::ABI_CallFunctionPPC(void *func, void *param1, void *param2, u32 p
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
// Pass a register as a parameter. // Pass a register as a parameter.
void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1) void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1)
{ {
ABI_AlignStack(0);
if (reg1 != ABI_PARAM1) if (reg1 != ABI_PARAM1)
MOV(32, R(ABI_PARAM1), R(reg1)); MOV(32, R(ABI_PARAM1), R(reg1));
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -365,13 +316,11 @@ void XEmitter::ABI_CallFunctionR(void *func, X64Reg reg1)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
// Pass two registers as parameters. // Pass two registers as parameters.
void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2, bool noProlog) void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2)
{ {
ABI_AlignStack(0, noProlog);
MOVTwo(64, ABI_PARAM1, reg1, ABI_PARAM2, reg2, ABI_PARAM3); MOVTwo(64, ABI_PARAM1, reg1, ABI_PARAM2, reg2, ABI_PARAM3);
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
if (distance >= 0x0000000080000000ULL && if (distance >= 0x0000000080000000ULL &&
@ -385,7 +334,6 @@ void XEmitter::ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2, bool noP
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0, noProlog);
} }
void XEmitter::MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, Gen::X64Reg dst2, Gen::X64Reg src2, X64Reg temp) void XEmitter::MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, Gen::X64Reg dst2, Gen::X64Reg src2, X64Reg temp)
@ -414,7 +362,6 @@ void XEmitter::MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, Gen::X64Reg
void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2) void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2)
{ {
ABI_AlignStack(0);
if (!arg1.IsSimpleReg(ABI_PARAM1)) if (!arg1.IsSimpleReg(ABI_PARAM1))
MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM1), arg1);
MOV(32, R(ABI_PARAM2), Imm32(param2)); MOV(32, R(ABI_PARAM2), Imm32(param2));
@ -430,12 +377,10 @@ void XEmitter::ABI_CallFunctionAC(void *func, const Gen::OpArg &arg1, u32 param2
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }
void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1) void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1)
{ {
ABI_AlignStack(0);
if (!arg1.IsSimpleReg(ABI_PARAM1)) if (!arg1.IsSimpleReg(ABI_PARAM1))
MOV(32, R(ABI_PARAM1), arg1); MOV(32, R(ABI_PARAM1), arg1);
u64 distance = u64(func) - (u64(code) + 5); u64 distance = u64(func) - (u64(code) + 5);
@ -450,6 +395,5 @@ void XEmitter::ABI_CallFunctionA(void *func, const Gen::OpArg &arg1)
{ {
CALL(func); CALL(func);
} }
ABI_RestoreStack(0);
} }

11
Source/Core/Common/x64Emitter.h
View File

@ -753,26 +753,17 @@ public:
// Pass a register as a parameter. // Pass a register as a parameter.
void ABI_CallFunctionR(void *func, X64Reg reg1); void ABI_CallFunctionR(void *func, X64Reg reg1);
void ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2, bool noProlog = false); void ABI_CallFunctionRR(void *func, X64Reg reg1, X64Reg reg2);
// Helper method for the above, or can be used separately. // Helper method for the above, or can be used separately.
void MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, Gen::X64Reg dst2, Gen::X64Reg src2, Gen::X64Reg temp); void MOVTwo(int bits, Gen::X64Reg dst1, Gen::X64Reg src1, Gen::X64Reg dst2, Gen::X64Reg src2, Gen::X64Reg temp);
// A function that doesn't have any control over what it will do to regs,
// such as the dispatcher, should be surrounded by these.
void ABI_PushAllCalleeSavedRegsAndAdjustStack();
void ABI_PopAllCalleeSavedRegsAndAdjustStack();
// Saves/restores the registers and adjusts the stack to be aligned as // Saves/restores the registers and adjusts the stack to be aligned as
// required by the ABI, where the previous alignment was as specified. // required by the ABI, where the previous alignment was as specified.
// Push returns the size of the shadow space, i.e. the offset of the frame. // Push returns the size of the shadow space, i.e. the offset of the frame.
size_t ABI_PushRegistersAndAdjustStack(u32 mask, size_t rsp_alignment, size_t needed_frame_size = 0); size_t ABI_PushRegistersAndAdjustStack(u32 mask, size_t rsp_alignment, size_t needed_frame_size = 0);
void ABI_PopRegistersAndAdjustStack(u32 mask, size_t rsp_alignment, size_t needed_frame_size = 0); void ABI_PopRegistersAndAdjustStack(u32 mask, size_t rsp_alignment, size_t needed_frame_size = 0);
unsigned int ABI_GetAlignedFrameSize(unsigned int frameSize, bool noProlog = false);
void ABI_AlignStack(unsigned int frameSize, bool noProlog = false);
void ABI_RestoreStack(unsigned int frameSize, bool noProlog = false);
inline int ABI_GetNumXMMRegs() { return 16; } inline int ABI_GetNumXMMRegs() { return 16; }
// Strange call wrappers. // Strange call wrappers.

2
Source/Core/Core/PowerPC/Jit64/Jit_LoadStorePaired.cpp
View File

@ -87,9 +87,7 @@ void Jit64::psq_l(UGeckoInstruction inst)
if (inst.W) if (inst.W)
OR(32, R(RSCRATCH2), Imm8(8)); OR(32, R(RSCRATCH2), Imm8(8));
ABI_AlignStack(0);
CALLptr(MScaled(RSCRATCH2, SCALE_8, (u32)(u64)asm_routines.pairedLoadQuantized)); CALLptr(MScaled(RSCRATCH2, SCALE_8, (u32)(u64)asm_routines.pairedLoadQuantized));
ABI_RestoreStack(0);
// MEMCHECK_START // FIXME: MMU does not work here because of unsafe memory access // MEMCHECK_START // FIXME: MMU does not work here because of unsafe memory access

8
Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp
View File

@ -476,16 +476,16 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce
switch (accessSize) switch (accessSize)
{ {
case 64: case 64:
ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U64) : ((void *)&Memory::Write_U64_Swap), reg_value, reg_addr, false); ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U64) : ((void *)&Memory::Write_U64_Swap), reg_value, reg_addr);
break; break;
case 32: case 32:
ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), reg_value, reg_addr, false); ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), reg_value, reg_addr);
break; break;
case 16: case 16:
ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), reg_value, reg_addr, false); ABI_CallFunctionRR(swap ? ((void *)&Memory::Write_U16) : ((void *)&Memory::Write_U16_Swap), reg_value, reg_addr);
break; break;
case 8: case 8:
ABI_CallFunctionRR((void *)&Memory::Write_U8, reg_value, reg_addr, false); ABI_CallFunctionRR((void *)&Memory::Write_U8, reg_value, reg_addr);
break; break;
} }
ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment); ABI_PopRegistersAndAdjustStack(registersInUse, rsp_alignment);