From 7a2d98b94844811e2ea1ad9c93d8eaa499c53f07 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 20 Mar 2018 01:05:48 -0400 Subject: [PATCH] JitAsm: Remove use of the JIT global in Generate() With this, JitAsm code doesn't have any reliance on the JIT global variable. This means the core JIT64 code no longer relies on said global at all. The Jit64 common code, however, still has some offenders. Notably, EmuCodeBlock and Jit64AsmCommon are the remaining places in the common code that make use of the global variable. --- Source/Core/Core/PowerPC/Jit64/JitAsm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp index e67f75e47a..872db4e46a 100644 --- a/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp +++ b/Source/Core/Core/PowerPC/Jit64/JitAsm.cpp @@ -112,7 +112,7 @@ void Jit64AsmRoutineManager::Generate() // Fast block number lookup. // ((PC >> 2) & mask) * sizeof(JitBlock*) = (PC & (mask << 2)) * 2 MOV(32, R(RSCRATCH), PPCSTATE(pc)); - u64 icache = reinterpret_cast(g_jit->GetBlockCache()->GetFastBlockMap()); + u64 icache = reinterpret_cast(m_jit.GetBlockCache()->GetFastBlockMap()); AND(32, R(RSCRATCH), Imm32(JitBaseBlockCache::FAST_BLOCK_MAP_MASK << 2)); if (icache <= INT_MAX) {