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

Merge pull request #4144 from aldelaro5/debugger-insertInstruction-fix 

Invalidate the icache when inserting a nop or a BLR
This commit is contained in:
Scott Mansell 2016-08-24 00:22:24 +12:00 committed by GitHub
parent 52af0770c3 cc7aa73081
commit 92f165d756
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/Debugger/PPCDebugInterface.cpp
View File

@ -163,6 +163,7 @@ void PPCDebugInterface::ToggleMemCheck(unsigned int address)
void PPCDebugInterface::InsertBLR(unsigned int address, unsigned int value) void PPCDebugInterface::InsertBLR(unsigned int address, unsigned int value)
{ {
PowerPC::HostWrite_U32(value, address); PowerPC::HostWrite_U32(value, address);
PowerPC::ScheduleInvalidateCacheThreadSafe(address);
} }
// ======================================================= // =======================================================

19
Source/Core/Core/PowerPC/PowerPC.cpp
View File

@ -10,6 +10,7 @@
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/HW/CPU.h" #include "Core/HW/CPU.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
@ -35,6 +36,12 @@ BreakPoints breakpoints;
MemChecks memchecks; MemChecks memchecks;
PPCDebugInterface debug_interface; PPCDebugInterface debug_interface;
static int s_invalidate_cache_thread_safe;
static void InvalidateCacheThreadSafe(u64 userdata, s64 cyclesLate)
{
ppcState.iCache.Invalidate(static_cast<u32>(userdata));
}
u32 CompactCR() u32 CompactCR()
{ {
u32 new_cr = 0; u32 new_cr = 0;
@ -117,6 +124,9 @@ void Init(int cpu_core)
// Changing the rounding mode has a limited effect. // Changing the rounding mode has a limited effect.
FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53); FPURoundMode::SetPrecisionMode(FPURoundMode::PREC_53);
s_invalidate_cache_thread_safe =
CoreTiming::RegisterEvent("invalidateEmulatedCache", InvalidateCacheThreadSafe);
memset(ppcState.sr, 0, sizeof(ppcState.sr)); memset(ppcState.sr, 0, sizeof(ppcState.sr));
ppcState.pagetable_base = 0; ppcState.pagetable_base = 0;
ppcState.pagetable_hashmask = 0; ppcState.pagetable_hashmask = 0;
@ -173,6 +183,15 @@ void Init(int cpu_core)
breakpoints.ClearAllTemporary(); breakpoints.ClearAllTemporary();
} }
void ScheduleInvalidateCacheThreadSafe(u32 address)
{
if (CPU::GetState() == CPU::State::CPU_RUNNING)
CoreTiming::ScheduleEvent(0, s_invalidate_cache_thread_safe, address,
CoreTiming::FromThread::NON_CPU);
else
PowerPC::ppcState.iCache.Invalidate(static_cast<u32>(address));
}
void Shutdown() void Shutdown()
{ {
InjectExternalCPUCore(nullptr); InjectExternalCPUCore(nullptr);

1
Source/Core/Core/PowerPC/PowerPC.h
View File

@ -138,6 +138,7 @@ extern PPCDebugInterface debug_interface;
void Init(int cpu_core); void Init(int cpu_core);
void Shutdown(); void Shutdown();
void DoState(PointerWrap& p); void DoState(PointerWrap& p);
void ScheduleInvalidateCacheThreadSafe(u32 address);
CoreMode GetMode(); CoreMode GetMode();
// [NOT THREADSAFE] CPU Thread or CPU::PauseAndLock or CORE_UNINITIALIZED // [NOT THREADSAFE] CPU Thread or CPU::PauseAndLock or CORE_UNINITIALIZED