From 44f481ec13db4660658b9a282e46ca2e4266ad00 Mon Sep 17 00:00:00 2001
From: magumagu <magumagu9@gmail.com>
Date: Sun, 25 May 2014 16:28:24 -0700
Subject: [PATCH] PPCCache: Get rid of FAST_ICACHE define.

There's no reason to keep around the ifdefs.
---
 Source/Core/Core/PowerPC/JitInterface.cpp |  4 ----
 Source/Core/Core/PowerPC/PPCCache.cpp     | 18 ++----------------
 Source/Core/Core/PowerPC/PPCCache.h       |  4 ----
 3 files changed, 2 insertions(+), 24 deletions(-)

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<<i))
 			{
@@ -94,7 +91,6 @@ namespace PowerPC
 				else
 					lookup_table[((tags[set][i] << 7) | set) & 0xfffff] = 0xff;
 			}
-#endif
 		valid[set] = 0;
 		JitInterface::InvalidateICache(addr & ~0x1f, 32);
 	}
@@ -105,7 +101,7 @@ namespace PowerPC
 			return Memory::ReadUnchecked_U32(addr);
 		u32 set = (addr >> 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<<i)))
-			{
-				t = i;
-				break;
-			}
-#endif
+
 		if (t == 0xff) // load to the cache
 		{
 			if (HID0.ILOCK) // instruction cache is locked
@@ -140,7 +128,6 @@ namespace PowerPC
 			// load
 			u8 *p = Memory::GetPointer(addr & ~0x1f);
 			memcpy(data[set][t], p, 32);
-#ifdef FAST_ICACHE
 			if (valid[set] & (1<<t))
 			{
 				if (tags[set][t] & (ICACHE_VMEM_BIT >> 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<<t;
 		}
diff --git a/Source/Core/Core/PowerPC/PPCCache.h b/Source/Core/Core/PowerPC/PPCCache.h
index de4b2cacae..e4f5b8d6e8 100644
--- a/Source/Core/Core/PowerPC/PPCCache.h
+++ b/Source/Core/Core/PowerPC/PPCCache.h
@@ -6,8 +6,6 @@
 
 #include "Common/CommonTypes.h"
 
-#define FAST_ICACHE
-
 namespace PowerPC
 {
 
@@ -29,11 +27,9 @@ namespace PowerPC
 		u32 way_from_valid[255];
 		u32 way_from_plru[128];
 
-#ifdef FAST_ICACHE
 		u8 lookup_table[1<<20];
 		u8 lookup_table_ex[1<<21];
 		u8 lookup_table_vmem[1<<20];
-#endif
 
 		InstructionCache();
 		u32 ReadInstruction(u32 addr);