From e07a9b107a5f8dcd185512762521821daa3ae29c Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 26 Jun 2010 03:07:07 +0000 Subject: [PATCH] JIT fix. Brings back the speed lost in r5378. The memmap function was incorrectly marking virtual memory as real memory. Fixes issue 2653. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5790 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/Memmap.cpp | 5 ----- Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp index eaa2899ed8..6bfa577b2e 100644 --- a/Source/Core/Core/Src/HW/Memmap.cpp +++ b/Source/Core/Core/Src/HW/Memmap.cpp @@ -821,11 +821,6 @@ bool IsRAMAddress(const u32 addr, bool allow_locked_cache) return true; else return false; - case 0x7C: - if (bFakeVMEM && addr >= 0x7e000000) - return true; - else - return false; default: return false; } diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp index 1b1d788d1c..f05f9fb233 100644 --- a/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp +++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit_Integer.cpp @@ -71,7 +71,6 @@ void Jit64::regimmop(int d, int a, bool binary, u32 value, Operation doop, void { // a == 0, which for these instructions imply value = 0 gpr.SetImmediate32(d, value); - gpr.StoreFromX64(d); } else { @@ -136,7 +135,7 @@ void Jit64::cmpXX(UGeckoInstruction inst) bool merge_branch = false; int test_crf = js.next_inst.BI >> 2; - // Check if the next intruction is a branch - if it is, merge the two. + // Check if the next instruction is a branch - if it is, merge the two. if (js.next_inst.OPCD == 16 && (js.next_inst.BO & BO_DONT_DECREMENT_FLAG) && !(js.next_inst.BO & 16) && (js.next_inst.BO & 4) && !js.next_inst.LK) { // Looks like a decent conditional branch that we can merge with.