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

[ARM32] Eat a register to store our memory base.

Browse Source 
This saves at least two instructions per fastmem operation.
This commit is contained in:
Ryan Houdek
2014-11-29 05:27:39 +00:00
parent e2f8286415
commit 32dc105aa3
4 changed files with 27 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/PowerPC/JitArm32/JitArm_BackPatch.cpp
View File

@ -225,9 +225,8 @@ u32 JitArm::EmitBackpatchRoutine(ARMXEmitter* emit, u32 flags, bool fastmem, boo
{ {
ARMReg temp2 = R10; ARMReg temp2 = R10;
Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK) Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK)
emit->BIC(temp, addr, mask); // 1 emit->BIC(temp, addr, mask);
emit->MOVI2R(temp2, (u32)Memory::base); // 2-3 emit->ADD(temp, temp, R8);
emit->ADD(temp, temp, temp2); // 4
if (flags & BackPatchInfo::FLAG_STORE && if (flags & BackPatchInfo::FLAG_STORE &&
flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64)) flags & (BackPatchInfo::FLAG_SIZE_F32 | BackPatchInfo::FLAG_SIZE_F64))

22
Source/Core/Core/PowerPC/JitArm32/JitArm_LoadStore.cpp
View File

@ -148,7 +148,7 @@ void JitArm::SafeStoreFromReg(s32 dest, u32 value, s32 regOffset, int accessSize
else if (Memory::IsRAMAddress(imm_addr)) else if (Memory::IsRAMAddress(imm_addr))
{ {
MOVI2R(rA, imm_addr); MOVI2R(rA, imm_addr);
EmitBackpatchRoutine(this, flags, SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem, false, RS); EmitBackpatchRoutine(this, flags, SConfig::GetInstance().m_LocalCoreStartupParameter.bFastmem, true, RS);
} }
else else
{ {
@ -487,14 +487,12 @@ void JitArm::lmw(UGeckoInstruction inst)
u32 a = inst.RA; u32 a = inst.RA;
ARMReg rA = gpr.GetReg(); ARMReg rA = gpr.GetReg();
ARMReg rB = gpr.GetReg();
MOVI2R(rA, inst.SIMM_16); MOVI2R(rA, inst.SIMM_16);
if (a) if (a)
ADD(rA, rA, gpr.R(a)); ADD(rA, rA, gpr.R(a));
Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK) Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK)
BIC(rA, rA, mask); // 3 BIC(rA, rA, mask);
MOVI2R(rB, (u32)Memory::base, false); // 4-5 ADD(rA, rA, R8);
ADD(rA, rA, rB); // 6
for (int i = inst.RD; i < 32; i++) for (int i = inst.RD; i < 32; i++)
{ {
@ -502,7 +500,7 @@ void JitArm::lmw(UGeckoInstruction inst)
LDR(RX, rA, (i - inst.RD) * 4); LDR(RX, rA, (i - inst.RD) * 4);
REV(RX, RX); REV(RX, RX);
} }
gpr.Unlock(rA, rB); gpr.Unlock(rA);
} }
void JitArm::stmw(UGeckoInstruction inst) void JitArm::stmw(UGeckoInstruction inst)
@ -514,22 +512,20 @@ void JitArm::stmw(UGeckoInstruction inst)
u32 a = inst.RA; u32 a = inst.RA;
ARMReg rA = gpr.GetReg(); ARMReg rA = gpr.GetReg();
ARMReg rB = gpr.GetReg(); ARMReg rB = gpr.GetReg();
ARMReg rC = gpr.GetReg();
MOVI2R(rA, inst.SIMM_16); MOVI2R(rA, inst.SIMM_16);
if (a) if (a)
ADD(rA, rA, gpr.R(a)); ADD(rA, rA, gpr.R(a));
Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK) Operand2 mask(2, 1); // ~(Memory::MEMVIEW32_MASK)
BIC(rA, rA, mask); // 3 BIC(rA, rA, mask);
MOVI2R(rB, (u32)Memory::base, false); // 4-5 ADD(rA, rA, R8);
ADD(rA, rA, rB); // 6
for (int i = inst.RD; i < 32; i++) for (int i = inst.RD; i < 32; i++)
{ {
ARMReg RX = gpr.R(i); ARMReg RX = gpr.R(i);
REV(rC, RX); REV(rB, RX);
STR(rC, rA, (i - inst.RD) * 4); STR(rB, rA, (i - inst.RD) * 4);
} }
gpr.Unlock(rA, rB, rC); gpr.Unlock(rA, rB);
} }
void JitArm::dcbst(UGeckoInstruction inst) void JitArm::dcbst(UGeckoInstruction inst)

43
Source/Core/Core/PowerPC/JitArm32/JitAsm.cpp
View File

@ -96,6 +96,7 @@ void JitArmAsmRoutineManager::Generate()
SUB(_SP, _SP, 4); SUB(_SP, _SP, 4);
MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]); MOVI2R(R9, (u32)&PowerPC::ppcState.spr[0]);
MOVI2R(R8, (u32)Memory::base);
FixupBranch skipToRealDispatcher = B(); FixupBranch skipToRealDispatcher = B();
dispatcher = GetCodePtr(); dispatcher = GetCodePtr();
@ -203,8 +204,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedFloatTwo = GetCodePtr(); const u8* loadPairedFloatTwo = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
nemit.VLD1(I_32, D0, R10); nemit.VLD1(I_32, D0, R10);
nemit.VREV32(I_8, D0, D0); nemit.VREV32(I_8, D0, D0);
@ -214,8 +214,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedFloatOne = GetCodePtr(); const u8* loadPairedFloatOne = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
nemit.VLD1(I_32, D0, R10); nemit.VLD1(I_32, D0, R10);
nemit.VREV32(I_8, D0, D0); nemit.VREV32(I_8, D0, D0);
@ -225,8 +224,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedU8Two = GetCodePtr(); const u8* loadPairedU8Two = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
SXTB(R12, R12); SXTB(R12, R12);
@ -251,8 +249,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedU8One = GetCodePtr(); const u8* loadPairedU8One = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRB(R12, R10); LDRB(R12, R10);
SXTB(R12, R12); SXTB(R12, R12);
@ -271,8 +268,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedS8Two = GetCodePtr(); const u8* loadPairedS8Two = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
SXTB(R12, R12); SXTB(R12, R12);
@ -297,8 +293,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedS8One = GetCodePtr(); const u8* loadPairedS8One = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRB(R12, R10); LDRB(R12, R10);
SXTB(R12, R12); SXTB(R12, R12);
@ -317,8 +312,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedU16Two = GetCodePtr(); const u8* loadPairedU16Two = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
REV16(R12, R12); REV16(R12, R12);
@ -345,8 +339,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedU16One = GetCodePtr(); const u8* loadPairedU16One = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
REV16(R12, R12); REV16(R12, R12);
@ -364,8 +357,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedS16Two = GetCodePtr(); const u8* loadPairedS16Two = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
REV16(R12, R12); REV16(R12, R12);
@ -392,8 +384,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
const u8* loadPairedS16One = GetCodePtr(); const u8* loadPairedS16One = GetCodePtr();
{ {
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
LDRH(R12, R10); LDRH(R12, R10);
@ -439,8 +430,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
TST(R10, arghmask); TST(R10, arghmask);
FixupBranch argh = B_CC(CC_NEQ); FixupBranch argh = B_CC(CC_NEQ);
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
nemit.VREV32(I_8, D0, D0); nemit.VREV32(I_8, D0, D0);
nemit.VST1(I_32, D0, R10); nemit.VST1(I_32, D0, R10);
@ -511,8 +501,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
TST(R10, arghmask); TST(R10, arghmask);
FixupBranch argh = B_CC(CC_NEQ); FixupBranch argh = B_CC(CC_NEQ);
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
VMOV(R12, S0); VMOV(R12, S0);
REV(R12, R12); REV(R12, R12);
@ -540,8 +529,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
TST(R10, arghmask); TST(R10, arghmask);
FixupBranch argh = B_CC(CC_NEQ); FixupBranch argh = B_CC(CC_NEQ);
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); VCVT(S0, S0, TO_INT | ROUND_TO_ZERO);
VMOV(R12, S0); VMOV(R12, S0);
@ -568,8 +556,7 @@ void JitArmAsmRoutineManager::GenerateCommon()
TST(R10, arghmask); TST(R10, arghmask);
FixupBranch argh = B_CC(CC_NEQ); FixupBranch argh = B_CC(CC_NEQ);
BIC(R10, R10, mask); BIC(R10, R10, mask);
MOVI2R(R12, (u32)Memory::base); ADD(R10, R10, R8);
ADD(R10, R10, R12);
VCVT(S0, S0, TO_INT | ROUND_TO_ZERO); VCVT(S0, S0, TO_INT | ROUND_TO_ZERO);
VMOV(R12, S0); VMOV(R12, S0);

2
Source/Core/Core/PowerPC/JitArm32/JitRegCache.cpp
View File

@ -54,7 +54,7 @@ ARMReg *ArmRegCache::GetPPCAllocationOrder(int &count)
// the ppc side. // the ppc side.
static ARMReg allocationOrder[] = static ARMReg allocationOrder[] =
{ {
R0, R1, R2, R3, R4, R5, R6, R7, R8 R0, R1, R2, R3, R4, R5, R6, R7
}; };
count = sizeof(allocationOrder) / sizeof(const int); count = sizeof(allocationOrder) / sizeof(const int);
return allocationOrder; return allocationOrder;