diff --git a/Source/Core/Core/PowerPC/JitInterface.cpp b/Source/Core/Core/PowerPC/JitInterface.cpp index 281f853911..cc76690348 100644 --- a/Source/Core/Core/PowerPC/JitInterface.cpp +++ b/Source/Core/Core/PowerPC/JitInterface.cpp @@ -211,7 +211,6 @@ namespace JitInterface u32 Read_Opcode_JIT(u32 _Address) { - #ifdef FAST_ICACHE if (bMMU && !bFakeVMEM && (_Address & Memory::ADDR_MASK_MEM1)) { _Address = Memory::TranslateAddress(_Address, Memory::FLAG_OPCODE); @@ -228,9 +227,6 @@ namespace JitInterface inst = Memory::ReadUnchecked_U32(_Address); else inst = PowerPC::ppcState.iCache.ReadInstruction(_Address); - #else - u32 inst = Memory::ReadUnchecked_U32(_Address); - #endif return inst; } diff --git a/Source/Core/Core/PowerPC/PPCCache.cpp b/Source/Core/Core/PowerPC/PPCCache.cpp index 3ccd6f683f..88c9b47053 100644 --- a/Source/Core/Core/PowerPC/PPCCache.cpp +++ b/Source/Core/Core/PowerPC/PPCCache.cpp @@ -59,11 +59,9 @@ namespace PowerPC { memset(valid, 0, sizeof(valid)); memset(plru, 0, sizeof(plru)); -#ifdef FAST_ICACHE memset(lookup_table, 0xff, sizeof(lookup_table)); memset(lookup_table_ex, 0xff, sizeof(lookup_table_ex)); memset(lookup_table_vmem, 0xff, sizeof(lookup_table_vmem)); -#endif JitInterface::ClearSafe(); } @@ -83,7 +81,6 @@ namespace PowerPC return; // invalidates the whole set u32 set = (addr >> 5) & 0x7f; -#ifdef FAST_ICACHE for (int i = 0; i < 8; i++) if (valid[set] & (1<> 5) & 0x7f; u32 tag = addr >> 12; -#ifdef FAST_ICACHE + u32 t; if (addr & ICACHE_VMEM_BIT) { @@ -119,15 +115,7 @@ namespace PowerPC { t = lookup_table[(addr>>5) & 0xfffff]; } -#else - u32 t = 0xff; - for (u32 i = 0; i < 8; i++) - if (tags[set][i] == tag && (valid[set] & (1<> 12)) @@ -157,7 +144,6 @@ namespace PowerPC lookup_table_ex[(addr>>5) & 0x1fffff] = t; else lookup_table[(addr>>5) & 0xfffff] = t; -#endif tags[set][t] = tag; valid[set] |= 1<