MMMU Speed Optimisations:

* Optimised the memory bounds check in MMU and MMU speed hack games.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6040 8ced0084-cf51-0410-be5f-012b33b47a6e

2 files changed, 7 insertions, 43 deletions

diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h
index cd1b164f08..332b345815 100644
--- a/Source/Core/Core/Src/HW/Memmap.h
+++ b/Source/Core/Core/Src/HW/Memmap.h
@@ -72,6 +72,10 @@ enum
 	IO_SIZE         = 0x10000,
 	EXRAM_SIZE      = 0x4000000,
 	EXRAM_MASK      = 0x3FFFFFF,
+
+	ADDR_MASK_HW_ACCESS	= 0x0c000000,
+	ADDR_MASK_MEM1		= 0x20000000,
+
 	#ifdef _M_IX86
 		MEMVIEW32_MASK  = 0x3FFFFFFF,
 	#endif
diff --git a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
index 3f5d39a364..a18088e66e 100644
--- a/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
+++ b/Source/Core/Core/Src/PowerPC/JitCommon/Jit_Util.cpp
@@ -31,7 +31,6 @@
 
 using namespace Gen;
 
-
 static const u8 GC_ALIGNED16(pbswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
 static u32 GC_ALIGNED16(float_buffer);
 
@@ -84,31 +83,9 @@ void EmuCodeBlock::SafeLoadRegToEAX(X64Reg reg_addr, int accessSize, s32 offset,
 		if (offset)
 			ADD(32, R(reg_addr), Imm32((u32)offset));
 
-		FixupBranch addrf0;
-		FixupBranch addr20;
-		if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-		{
-			if (Core::g_CoreStartupParameter.bMMU)
-			{
-				CMP(32, R(reg_addr), Imm32(0xf0000000));
-				addrf0 = J_CC(CC_GE);
-			}
-			TEST(32, R(reg_addr), Imm32(0x20000000));
-			addr20 = J_CC(CC_NZ);
-		}
-
-		TEST(32, R(reg_addr), Imm32(0x0C000000));
+		TEST(32, R(reg_addr), Imm32(Memory::ADDR_MASK_HW_ACCESS | Memory::ADDR_MASK_MEM1));
 		FixupBranch fast = J_CC(CC_Z);
 
-		if (Core::g_CoreStartupParameter.bMMU || Core::g_CoreStartupParameter.iTLBHack)
-		{
-			if (Core::g_CoreStartupParameter.bMMU)
-			{
-				SetJumpTarget(addrf0);				
-			}			
-			SetJumpTarget(addr20);
-		}
-
 		switch (accessSize)
 		{
 		case 32: ABI_CallFunctionR(thunks.ProtectFunction((void *)&Memory::Read_U32, 1), reg_addr); break;
@@ -148,26 +125,9 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce
 	if (offset)
 		ADD(32, R(reg_addr), Imm32((u32)offset));
 
-	// TODO: Figure out a cleaner way to check memory bounds
-	FixupBranch addrf0;
-	FixupBranch addr20;
-	if (Core::g_CoreStartupParameter.bMMU)
-	{
-		CMP(32, R(reg_addr), Imm32(0xf0000000));
-		addrf0 = J_CC(CC_GE);
-		TEST(32, R(reg_addr), Imm32(0x20000000));
-		addr20 = J_CC(CC_NZ);
-	}
-
-	TEST(32, R(reg_addr), Imm32(0x0C000000));
+	TEST(32, R(reg_addr), Imm32(Memory::ADDR_MASK_HW_ACCESS | Memory::ADDR_MASK_MEM1));
 	FixupBranch fast = J_CC(CC_Z);
 
-	if (Core::g_CoreStartupParameter.bMMU)
-	{
-		SetJumpTarget(addrf0);
-		SetJumpTarget(addr20);
-	}
-
 	switch (accessSize)
 	{
 	case 32: ABI_CallFunctionRR(thunks.ProtectFunction(swap ? ((void *)&Memory::Write_U32) : ((void *)&Memory::Write_U32_Swap), 2), reg_value, reg_addr); break;
@@ -182,7 +142,7 @@ void EmuCodeBlock::SafeWriteRegToReg(X64Reg reg_value, X64Reg reg_addr, int acce
 
 void EmuCodeBlock::SafeWriteFloatToReg(X64Reg xmm_value, X64Reg reg_addr)
 {
-	TEST(32, R(reg_addr), Imm32(0x0C000000));
+	TEST(32, R(reg_addr), Imm32(Memory::ADDR_MASK_HW_ACCESS | Memory::ADDR_MASK_MEM1));
 	if (false && cpu_info.bSSSE3) {
 		// This path should be faster but for some reason it causes errors so I've disabled it.
 		FixupBranch argh = J_CC(CC_Z);