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 #11170 from JosJuice/jit64-dispatcher-no-check 

Jit64: Add dispatcher_no_timing_check jump target
This commit is contained in:
JMC47 2022-10-22 06:19:00 -04:00 committed by GitHub
parent 55d269c9e0 09f9a58859
commit b7310a180f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -598,10 +598,6 @@ void Jit64::JustWriteExit(u32 destination, bool bl, u32 after)
MOV(32, PPCSTATE(pc), Imm32(destination));
// Do not skip breakpoint check if debugging.
const u8* dispatcher =
m_enable_debugging ? asm_routines.dispatcher : asm_routines.dispatcher_no_check;
// Perform downcount flag check, followed by the requested exit
if (bl)
{
@ -613,7 +609,7 @@ void Jit64::JustWriteExit(u32 destination, bool bl, u32 after)
SwitchToNearCode();
linkData.exitPtrs = GetWritableCodePtr();
CALL(dispatcher);
CALL(asm_routines.dispatcher_no_timing_check);
SetJumpTarget(after_fixup);
POP(RSCRATCH);
@ -624,7 +620,7 @@ void Jit64::JustWriteExit(u32 destination, bool bl, u32 after)
J_CC(CC_LE, asm_routines.do_timing);
linkData.exitPtrs = GetWritableCodePtr();
JMP(dispatcher, true);
JMP(asm_routines.dispatcher_no_timing_check, true);
}
b->linkData.push_back(linkData);

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

@ -83,12 +83,14 @@ void Jit64AsmRoutineManager::Generate()
SUB(32, PPCSTATE(downcount), R(RSCRATCH2));
dispatcher = GetCodePtr();
// Expected result of SUB(32, PPCSTATE(downcount), Imm32(block_cycles)) is in RFLAGS.
// Branch if downcount is <= 0 (signed).
FixupBranch bail = J_CC(CC_LE, true);
FixupBranch dbg_exit;
dispatcher_no_timing_check = GetCodePtr();
FixupBranch dbg_exit;
if (enable_debugging)
{
MOV(64, R(RSCRATCH), ImmPtr(CPU::GetStatePtr()));

7
Source/Core/Core/PowerPC/Jit64Common/BlockCache.cpp
View File

@ -13,12 +13,9 @@ JitBlockCache::JitBlockCache(JitBase& jit) : JitBaseBlockCache{jit}
void JitBlockCache::WriteLinkBlock(const JitBlock::LinkData& source, const JitBlock* dest)
{
// Do not skip breakpoint check if debugging.
const u8* dispatcher = m_jit.IsDebuggingEnabled() ? m_jit.GetAsmRoutines()->dispatcher :
m_jit.GetAsmRoutines()->dispatcher_no_check;
u8* location = source.exitPtrs;
const u8* address = dest ? dest->checkedEntry : dispatcher;
const u8* address =
dest ? dest->checkedEntry : m_jit.GetAsmRoutines()->dispatcher_no_timing_check;
if (source.call)
{
Gen::XEmitter emit(location, location + 5);

1
Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
View File

@ -84,6 +84,7 @@ void JitArm64::GenerateAsm()
// The result of slice decrementation should be in flags if somebody jumped here
FixupBranch bail = B(CC_LE);
dispatcher_no_timing_check = GetCodePtr();
dispatcher_no_check = GetCodePtr();
bool assembly_dispatcher = true;

1
Source/Core/Core/PowerPC/JitCommon/JitAsmCommon.h
View File

@ -17,6 +17,7 @@ struct CommonAsmRoutinesBase
const u8* dispatcher_mispredicted_blr;
const u8* dispatcher;
const u8* dispatcher_no_timing_check;
const u8* dispatcher_no_check;
const u8* do_timing;