piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

PowerPC: Remove MSR macro.

Browse Source
This commit is contained in:
Admiral H. Curtiss
2023-01-09 22:55:49 +01:00
parent 4b6b8fa1ae
commit ba1b624e1b
26 changed files with 120 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/PatchEngine.cpp
View File

@ -277,7 +277,7 @@ static void ApplyMemoryPatches(std::span<const std::size_t> memory_patch_indices
// We require at least 2 stack frames, if the stack is shallower than that then it won't work.
static bool IsStackSane()
{
DEBUG_ASSERT(MSR.DR && MSR.IR);
DEBUG_ASSERT(PowerPC::ppcState.msr.DR && PowerPC::ppcState.msr.IR);
// Check the stack pointer
u32 SP = GPR(1);
@ -315,12 +315,12 @@ bool ApplyFramePatches()
// callback hook we can end up catching the game in an exception vector.
// We deal with this by returning false so that SystemTimers will reschedule us in a few cycles
// where we can try again after the CPU hopefully returns back to the normal instruction flow.
if (!MSR.DR || !MSR.IR || !IsStackSane())
if (!PowerPC::ppcState.msr.DR || !PowerPC::ppcState.msr.IR || !IsStackSane())
{
DEBUG_LOG_FMT(ACTIONREPLAY,
"Need to retry later. CPU configuration is currently incorrect. PC = {:#010x}, "
"MSR = {:#010x}",
PowerPC::ppcState.pc, MSR.Hex);
PowerPC::ppcState.pc, PowerPC::ppcState.msr.Hex);
return false;
}