mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-16 05:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Memchecks support out of debug only builds

Browse source 
It wouldn't impact performance until at least one memcheck is enabled.  Because of this, it can be used in release builds without much impact, the only thing that woudl change is the use of HasAny method instead of preprocessor conditionals.  Since the perforamnce decrease comes right when the first memcheck is added and restored when the last is removed, it basically is all beneficial and works the same way.
This commit is contained in:
aldelaro5 2016-09-09 14:10:48 -04:00
parent 6e488e65e3
commit 09df343247
8 changed files with 33 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Source/Core/Core/PowerPC/MMU.cpp
View file

@ -412,31 +412,32 @@ u32 HostRead_Instruction(const u32 address)
static __forceinline void Memcheck(u32 address, u32 var, bool write, int size)
{
#ifdef ENABLE_MEM_CHECK
TMemCheck* mc = PowerPC::memchecks.GetMemCheck(address);
if (mc)
if (PowerPC::memchecks.HasAny())
{
if (CPU::IsStepping())
TMemCheck* mc = PowerPC::memchecks.GetMemCheck(address);
if (mc)
{
// Disable when stepping so that resume works.
return;
}
mc->numHits++;
bool pause = mc->Action(&PowerPC::debug_interface, var, address, write, size, PC);
if (pause)
{
CPU::Break();
// Fake a DSI so that all the code that tests for it in order to skip
// the rest of the instruction will apply. (This means that
// watchpoints will stop the emulator before the offending load/store,
// not after like GDB does, but that's better anyway. Just need to
// make sure resuming after that works.)
// It doesn't matter if ReadFromHardware triggers its own DSI because
// we'll take it after resuming.
PowerPC::ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
if (CPU::IsStepping())
{
// Disable when stepping so that resume works.
return;
}
mc->numHits++;
bool pause = mc->Action(&PowerPC::debug_interface, var, address, write, size, PC);
if (pause)
{
CPU::Break();
// Fake a DSI so that all the code that tests for it in order to skip
// the rest of the instruction will apply. (This means that
// watchpoints will stop the emulator before the offending load/store,
// not after like GDB does, but that's better anyway. Just need to
// make sure resuming after that works.)
// It doesn't matter if ReadFromHardware triggers its own DSI because
// we'll take it after resuming.
PowerPC::ppcState.Exceptions |= EXCEPTION_DSI | EXCEPTION_FAKE_MEMCHECK_HIT;
}
}
}
#endif
}
u8 Read_U8(const u32 address)
@ -604,9 +605,8 @@ std::string HostGetString(u32 address, size_t size)
bool IsOptimizableRAMAddress(const u32 address)
{
#ifdef ENABLE_MEM_CHECK
return false;
#endif
if (PowerPC::memchecks.HasAny())
return false;
if (!UReg_MSR(MSR).DR)
return false;
@ -745,9 +745,8 @@ void ClearCacheLine(u32 address)
u32 IsOptimizableMMIOAccess(u32 address, u32 accessSize)
{
#ifdef ENABLE_MEM_CHECK
return 0;
#endif
if (PowerPC::memchecks.HasAny())
return 0;
if (!UReg_MSR(MSR).DR)
return 0;
@ -768,9 +767,8 @@ u32 IsOptimizableMMIOAccess(u32 address, u32 accessSize)
bool IsOptimizableGatherPipeWrite(u32 address)
{
#ifdef ENABLE_MEM_CHECK
return 0;
#endif
if (PowerPC::memchecks.HasAny())
return 0;
if (!UReg_MSR(MSR).DR)
return 0;

2
Source/Core/Core/PowerPC/PowerPC.cpp
View file

@ -402,12 +402,10 @@ void CheckExceptions()
INFO_LOG(POWERPC, "EXCEPTION_FPU_UNAVAILABLE");
ppcState.Exceptions &= ~EXCEPTION_FPU_UNAVAILABLE;
}
#ifdef ENABLE_MEM_CHECK
else if (exceptions & EXCEPTION_FAKE_MEMCHECK_HIT)
{
ppcState.Exceptions &= ~EXCEPTION_DSI & ~EXCEPTION_FAKE_MEMCHECK_HIT;
}
#endif
else if (exceptions & EXCEPTION_DSI)
{
SRR0 = PC;