From 460149917932482960932d29a2f851140fde5973 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 22 Jan 2017 05:57:44 -0500 Subject: [PATCH 1/3] JitArm64_LoadStoreFloating: Eliminate JIT global usages --- .../Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp index ec85315446..c869bd61a9 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStoreFloating.cpp @@ -325,8 +325,7 @@ void JitArm64::stfXX(UGeckoInstruction inst) ARM64Reg XA = EncodeRegTo64(addr_reg); - if (is_immediate && - !(g_jit->jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr))) + if (is_immediate && !(jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr))) { MOVI2R(XA, imm_addr); @@ -350,7 +349,7 @@ void JitArm64::stfXX(UGeckoInstruction inst) if (is_immediate) { - if (g_jit->jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr)) + if (jo.optimizeGatherPipe && PowerPC::IsOptimizableGatherPipeWrite(imm_addr)) { int accessSize; if (flags & BackPatchInfo::FLAG_SIZE_F64) From a18ab5e1549b8c417a8e7c5a6c75f347a02fc17b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 22 Jan 2017 05:59:38 -0500 Subject: [PATCH 2/3] JitArm64_LoadStore: Eliminate JIT global usages --- Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp index 319cca3bba..bdead8e577 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_LoadStore.cpp @@ -597,7 +597,7 @@ void JitArm64::dcbx(UGeckoInstruction inst) AND(value, addr, 32 - 10, 28 - 10); // upper three bits and last 10 bit are masked for the bitset // of cachelines, 0x1ffffc00 LSR(value, value, 5 + 5); // >> 5 for cache line size, >> 5 for width of bitset - MOVP2R(EncodeRegTo64(WA), g_jit->GetBlockCache()->GetBlockBitSet()); + MOVP2R(EncodeRegTo64(WA), GetBlockCache()->GetBlockBitSet()); LDR(value, EncodeRegTo64(WA), ArithOption(EncodeRegTo64(value), true)); LSR(addr, addr, 5); // mask sizeof cacheline, & 0x1f is the position within the bitset From a97aef2e94c938a627433845c68c6a546dcf756f Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 22 Jan 2017 06:01:30 -0500 Subject: [PATCH 3/3] Jit: Eliminate JIT global usages --- Source/Core/Core/PowerPC/JitArm64/Jit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp index a424166574..fc12649848 100644 --- a/Source/Core/Core/PowerPC/JitArm64/Jit.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/Jit.cpp @@ -502,7 +502,7 @@ const u8* JitArm64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer* code_buf, JitB // Gather pipe writes using a non-immediate address are discovered by profiling. bool gatherPipeIntCheck = - g_jit->js.fifoWriteAddresses.find(ops[i].address) != g_jit->js.fifoWriteAddresses.end(); + js.fifoWriteAddresses.find(ops[i].address) != js.fifoWriteAddresses.end(); if (jo.optimizeGatherPipe && (js.fifoBytesSinceCheck >= 32 || js.mustCheckFifo)) {