Merge pull request dolphin-emu#11840 from krnlyng/blr_and_block_map_f…

…ixes Blr and block map fixes
ZhouzlCHN · May 23, 2023 · 532c6a8 · 532c6a8
2 parents 60cb88d + 8943a9a
commit 532c6a8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Source/Core/Core/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/PowerPC/Jit64/Jit.cpp
@@ -276,6 +276,8 @@ void Jit64::Init()
   m_const_pool.Init(AllocChildCodeSpace(constpool_size), constpool_size);
   ResetCodePtr();
 
+  InitBLROptimization();
+
   m_stack_guard = nullptr;
 
   blocks.Init();

diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp
@@ -66,6 +66,8 @@ void JitArm64::Init()
   code_block.m_gpa = &js.gpa;
   code_block.m_fpa = &js.fpa;
 
+  InitBLROptimization();
+
   GenerateAsm();
 
   ResetFreeMemoryRanges();

diff --git a/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp b/Source/Core/Core/PowerPC/JitArm64/JitAsm.cpp
@@ -146,7 +146,7 @@ void JitArm64::GenerateAsm()
       ORR(pc_masked, ARM64Reg::WZR,
           LogicalImm(JitBaseBlockCache::FAST_BLOCK_MAP_FALLBACK_MASK << 3, 32));
       AND(pc_masked, pc_masked, DISPATCHER_PC, ArithOption(DISPATCHER_PC, ShiftType::LSL, 1));
-      MOVP2R(cache_base, GetBlockCache()->GetFastBlockMap());
+      MOVP2R(cache_base, GetBlockCache()->GetFastBlockMapFallback());
       LDR(block, cache_base, EncodeRegTo64(pc_masked));
       FixupBranch not_found = CBZ(block);