ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
hrydgard 2009-07-18 23:40:30 +00:00
parent 6b711a55cf
commit 45d9d3191b
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -60,14 +60,6 @@ namespace Memory
// LOCAL SETTINGS // 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 /* Enable the Translation Lookaside Buffer functions. TLBHack = 1 in Dolphin.ini or a
<GameID>.ini file will set this to true */ <GameID>.ini file will set this to true */
bool bFakeVMEM = false; bool bFakeVMEM = false;
@ -526,7 +518,7 @@ void Clear()
bool AreMemoryBreakpointsActivated() bool AreMemoryBreakpointsActivated()
{ {
#ifdef NOCHECK #ifndef ENABLE_MEM_CHECK
return false; return false;
#else #else
return true; return true;

7
Source/Core/Core/Src/HW/Memmap.h
View File

@ -18,6 +18,13 @@
#ifndef _MEMMAP_H #ifndef _MEMMAP_H
#define _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 // Includes
#include <string> #include <string>
#include "Common.h" #include "Common.h"

16
Source/Core/Core/Src/HW/MemmapFunctions.cpp
View File

@ -303,7 +303,7 @@ u8 Read_U8(const u32 _Address)
{ {
u8 _var = 0; u8 _var = 0;
ReadFromHardware<u8>(_var, _Address, _Address, FLAG_READ); ReadFromHardware<u8>(_var, _Address, _Address, FLAG_READ);
#ifndef NOCHECK #ifdef ENABLE_MEM_CHECK
TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -318,7 +318,7 @@ u16 Read_U16(const u32 _Address)
{ {
u16 _var = 0; u16 _var = 0;
ReadFromHardware<u16>(_var, _Address, _Address, FLAG_READ); ReadFromHardware<u16>(_var, _Address, _Address, FLAG_READ);
#ifndef NOCHECK #ifdef ENABLE_MEM_CHECK
TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -340,7 +340,7 @@ u32 Read_U32(const u32 _Address)
#endif*/ #endif*/
u32 _var = 0; u32 _var = 0;
ReadFromHardware<u32>(_var, _Address, _Address, FLAG_READ); ReadFromHardware<u32>(_var, _Address, _Address, FLAG_READ);
#ifndef NOCHECK #ifdef ENABLE_MEM_CHECK
TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -356,7 +356,7 @@ u64 Read_U64(const u32 _Address)
{ {
u64 _var = 0; u64 _var = 0;
ReadFromHardware<u64>(_var, _Address, _Address, FLAG_READ); ReadFromHardware<u64>(_var, _Address, _Address, FLAG_READ);
#ifndef NOCHECK #ifdef ENABLE_MEM_CHECK
TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -370,7 +370,7 @@ u64 Read_U64(const u32 _Address)
void Write_U8(const u8 _Data, const u32 _Address) void Write_U8(const u8 _Data, const u32 _Address)
{ {
#ifndef NOCHECK #ifdef ENABLE_MEM_CHECK
TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -384,7 +384,7 @@ void Write_U8(const u8 _Data, const u32 _Address)
void Write_U16(const u16 _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); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -399,7 +399,7 @@ void Write_U16(const u16 _Data, const u32 _Address)
void Write_U32(const u32 _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); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {
@ -413,7 +413,7 @@ void Write_U32(const u32 _Data, const u32 _Address)
void Write_U64(const u64 _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); TMemCheck *mc = PowerPC::memchecks.GetMemCheck(_Address);
if (mc) if (mc)
{ {