From 45d9d3191b1f4cf19971bd915358d71b12683021 Mon Sep 17 00:00:00 2001
From: hrydgard <hrydgard@gmail.com>
Date: Sat, 18 Jul 2009 23:40:30 +0000
Subject: [PATCH] Move define to the right place, get some free speed (just a
 tiny bit though)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3841 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/Core/Src/HW/Memmap.cpp          | 10 +---------
 Source/Core/Core/Src/HW/Memmap.h            |  7 +++++++
 Source/Core/Core/Src/HW/MemmapFunctions.cpp | 16 ++++++++--------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
index a58d171dc9..d1cfbb1bb4 100644
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ b/Source/Core/Core/Src/HW/Memmap.cpp
@@ -60,14 +60,6 @@ namespace Memory
 // LOCAL SETTINGS
 // ----------------
 
-// Disable Memory Checks
-// #define NOCHECK
-
-// Always disable memory checks if the Release build
-#if MAX_LOGLEVEL < 4
-	#define NOCHECK
-#endif
-
 /* Enable the Translation Lookaside Buffer functions. TLBHack = 1 in Dolphin.ini or a
    <GameID>.ini file will set this to true */
 bool bFakeVMEM = false;
@@ -526,7 +518,7 @@ void Clear()
 
 bool AreMemoryBreakpointsActivated()
 {
-#ifdef NOCHECK
+#ifndef ENABLE_MEM_CHECK
 	return false;
 #else
 	return true;
diff --git a/Source/Core/Core/Src/HW/Memmap.h b/Source/Core/Core/Src/HW/Memmap.h
index 6c334f6abb..9f788f5fa0 100644
--- a/Source/Core/Core/Src/HW/Memmap.h
+++ b/Source/Core/Core/Src/HW/Memmap.h
@@ -18,6 +18,13 @@
 #ifndef _MEMMAP_H
 #define _MEMMAP_H
 
+// Enable memory checks in the Debug/DebugFast builds, but NOT in release
+#if MAX_LOGLEVEL >= 4
+#if _DEBUG
+	#define ENABLE_MEM_CHECK
+#endif
+#endif
+
 // Includes
 #include <string>
 #include "Common.h"
diff --git a/Source/Core/Core/Src/HW/MemmapFunctions.cpp b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
index 513a508db5..1f6b2af4a1 100644
--- a/Source/Core/Core/Src/HW/MemmapFunctions.cpp
+++ b/Source/Core/Core/Src/HW/MemmapFunctions.cpp
@@ -303,7 +303,7 @@ u8 Read_U8(const u32 _Address)
 {    
 	u8 _var = 0;
 	ReadFromHardware<u8>(_var, _Address, _Address, FLAG_READ);
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
     TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -318,7 +318,7 @@ u16 Read_U16(const u32 _Address)
 {
 	u16 _var = 0;
 	ReadFromHardware<u16>(_var, _Address, _Address, FLAG_READ);
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -340,7 +340,7 @@ u32 Read_U32(const u32 _Address)
 	#endif*/
 	u32 _var = 0;	
 	ReadFromHardware<u32>(_var, _Address, _Address, FLAG_READ);
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -356,7 +356,7 @@ u64 Read_U64(const u32 _Address)
 {
 	u64 _var = 0;
 	ReadFromHardware<u64>(_var, _Address, _Address, FLAG_READ);
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -370,7 +370,7 @@ u64 Read_U64(const u32 _Address)
 
 void Write_U8(const u8 _Data, const u32 _Address)	
 {
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -384,7 +384,7 @@ void Write_U8(const u8 _Data, const u32 _Address)
 
 void Write_U16(const u16 _Data, const u32 _Address)
 {
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -399,7 +399,7 @@ void Write_U16(const u16 _Data, const u32 _Address)
 
 void Write_U32(const u32 _Data, const u32 _Address)
 {	
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
 	TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{
@@ -413,7 +413,7 @@ void Write_U32(const u32 _Data, const u32 _Address)
 
 void Write_U64(const u64 _Data, const u32 _Address)
 {
-#ifndef NOCHECK
+#ifdef ENABLE_MEM_CHECK
     TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
 	if (mc)
 	{