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

Merge pull request #2736 from degasus/farcache

Browse Source 
JitArm64: Farcache
This commit is contained in:
Ryan Houdek
2015-07-15 08:41:58 -05:00
parent 41bdaece5e 6f38d1baa1
commit c0f80ca524
11 changed files with 75 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -490,9 +490,7 @@ void Jit64::Trace()
void Jit64::Jit(u32 em_address)
{
if (GetSpaceLeft() < 0x10000 ||
farcode.GetSpaceLeft() < 0x10000 ||
trampolines.GetSpaceLeft() < 0x10000 ||
if (IsAlmostFull() || farcode.IsAlmostFull() || trampolines.IsAlmostFull() ||
blocks.IsFull() ||
SConfig::GetInstance().bJITNoBlockCache ||
m_clear_cache_asap)

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

@ -473,7 +473,7 @@ void JitIL::Trace()
void JitIL::Jit(u32 em_address)
{
if (GetSpaceLeft() < 0x10000 || farcode.GetSpaceLeft() < 0x10000 || blocks.IsFull() ||
if (IsAlmostFull() || farcode.IsAlmostFull() || blocks.IsFull() ||
SConfig::GetInstance().bJITNoBlockCache)
{
ClearCache();

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

@ -17,6 +17,7 @@ using namespace Arm64Gen;
void JitArm64::Init()
{
AllocCodeSpace(CODE_SIZE);
farcode.Init(SConfig::GetInstance().bMMU ? FARCODE_SIZE_MMU : FARCODE_SIZE);
jo.enableBlocklink = true;
jo.optimizeGatherPipe = true;
UpdateMemoryOptions();
@ -36,6 +37,7 @@ void JitArm64::Init()
void JitArm64::ClearCache()
{
ClearCodeSpace();
farcode.ClearCodeSpace();
blocks.Clear();
UpdateMemoryOptions();
}
@ -43,6 +45,7 @@ void JitArm64::ClearCache()
void JitArm64::Shutdown()
{
FreeCodeSpace();
farcode.Shutdown();
blocks.Shutdown();
asm_routines.Shutdown();
}
@ -276,7 +279,7 @@ void JitArm64::SingleStep()
void JitArm64::Jit(u32)
{
if (GetSpaceLeft() < 0x10000 || blocks.IsFull() || SConfig::GetInstance().bJITNoBlockCache)
if (IsAlmostFull() || farcode.IsAlmostFull() || blocks.IsFull() || SConfig::GetInstance().bJITNoBlockCache)
{
ClearCache();
}
@ -397,6 +400,10 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(msr));
FixupBranch b1 = TBNZ(WA, 13); // Test FP enabled bit
FixupBranch far = B();
SwitchToFarCode();
SetJumpTarget(far);
gpr.Flush(FLUSH_MAINTAIN_STATE);
fpr.Flush(FLUSH_MAINTAIN_STATE);
@ -407,6 +414,8 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
MOVI2R(WA, js.compilerPC);
WriteExceptionExit(WA);
SwitchToNearCode();
SetJumpTarget(b1);
js.firstFPInstructionFound = true;
@ -450,5 +459,6 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitB
b->originalSize = code_block.m_num_instructions;
FlushIcache();
farcode.FlushIcache();
return start;
}

25
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -18,6 +18,15 @@
#define PPCSTATE_OFF(elem) (offsetof(PowerPC::PowerPCState, elem))
// A place to throw blocks of code we don't want polluting the cache, e.g. rarely taken
// exception branches.
class FarCodeCacheArm64 : public Arm64Gen::ARM64CodeBlock
{
public:
void Init(int size) { AllocCodeSpace(size); }
void Shutdown() { FreeCodeSpace(); }
};
// Some asserts to make sure we will be able to load everything
static_assert(PPCSTATE_OFF(spr[1023]) <= 16380, "LDR(32bit) can't reach the last SPR");
static_assert((PPCSTATE_OFF(ps[0][0]) % 8) == 0, "LDR(64bit VFP) requires FPRs to be 8 byte aligned");
@ -185,6 +194,22 @@ private:
ARM64FloatEmitter m_float_emit;
FarCodeCacheArm64 farcode;
u8* nearcode; // Backed up when we switch to far code.
// Simple functions to switch between near and far code emitting
void SwitchToFarCode()
{
nearcode = GetWritableCodePtr();
SetCodePtr(farcode.GetWritableCodePtr());
}
void SwitchToNearCode()
{
farcode.SetCodePtr(GetWritableCodePtr());
SetCodePtr(nearcode);
}
// Dump a memory range of code
void DumpCode(const u8* start, const u8* end);

12
Source/Core/Core/PowerPC/JitArm64/JitArm64_Branch.cpp
View File

@ -142,6 +142,10 @@ void JitArm64::bcx(UGeckoInstruction inst)
!(inst.BO_2 & BO_BRANCH_IF_TRUE));
}
FixupBranch far = B();
SwitchToFarCode();
SetJumpTarget(far);
if (inst.LK)
{
u32 Jumpto = js.compilerPC + 4;
@ -161,6 +165,8 @@ void JitArm64::bcx(UGeckoInstruction inst)
WriteExit(destination);
SwitchToNearCode();
if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)
@ -235,6 +241,10 @@ void JitArm64::bclrx(UGeckoInstruction inst)
!(inst.BO_2 & BO_BRANCH_IF_TRUE));
}
FixupBranch far = B();
SwitchToFarCode();
SetJumpTarget(far);
LDR(INDEX_UNSIGNED, WA, X29, PPCSTATE_OFF(spr[SPR_LR]));
AND(WA, WA, 30, 29); // Wipe the bottom 2 bits.
@ -252,6 +262,8 @@ void JitArm64::bclrx(UGeckoInstruction inst)
WriteExitDestInR(WA);
SwitchToNearCode();
if ((inst.BO & BO_DONT_CHECK_CONDITION) == 0)
SetJumpTarget( pConditionDontBranch );
if ((inst.BO & BO_DONT_DECREMENT_FLAG) == 0)

6
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp
View File

@ -411,6 +411,10 @@ void JitArm64::lXX(UGeckoInstruction inst)
// if it's still 0, we can wait until the next event
FixupBranch noIdle = CBNZ(gpr.R(d));
FixupBranch far = B();
SwitchToFarCode();
SetJumpTarget(far);
gpr.Flush(FLUSH_MAINTAIN_STATE);
fpr.Flush(FLUSH_MAINTAIN_STATE);
@ -423,6 +427,8 @@ void JitArm64::lXX(UGeckoInstruction inst)
gpr.Unlock(WA);
WriteExceptionExit();
SwitchToNearCode();
SetJumpTarget(noIdle);
//js.compilerPC += 8;

2
Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStorePaired.cpp
View File

@ -156,7 +156,7 @@ void JitArm64::psq_st(UGeckoInstruction inst)
m_float_emit.ABI_PushRegisters(fprs_in_use, X30);
BLR(EncodeRegTo64(type_reg));
m_float_emit.ABI_PopRegisters(fprs_in_use, X30);
ABI_PushRegisters(gprs_in_use);
ABI_PopRegisters(gprs_in_use);
SetJumpTarget(continue1);
}

6
Source/Core/Core/PowerPC/JitArm64/JitArm64_SystemRegisters.cpp
View File

@ -184,6 +184,10 @@ void JitArm64::twx(UGeckoInstruction inst)
SetJumpTarget(fixup);
}
FixupBranch far = B();
SwitchToFarCode();
SetJumpTarget(far);
gpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
fpr.Flush(FlushMode::FLUSH_MAINTAIN_STATE);
@ -196,6 +200,8 @@ void JitArm64::twx(UGeckoInstruction inst)
// WA is unlocked in this function
WriteExceptionExit(WA);
SwitchToNearCode();
SetJumpTarget(dont_trap);
if (!analyzer.HasOption(PPCAnalyst::PPCAnalyzer::OPTION_CONDITIONAL_CONTINUE))