diff options
| author | Tilka <tilkax@gmail.com> | 2019-03-13 18:12:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 18:12:52 +0000 |
| commit | 7b354fa7ac9fd1a5430d9e1fbf089f7f30ec8d9f (patch) | |
| tree | e7a0ab5237bbbd641fed167b71de8a35549b932a /Source/Core/DolphinQt/Debugger/CodeWidget.cpp | |
| parent | 7eae5b91d697511570f204d08f36f79ca1a7af5c (diff) | |
| parent | e3075f38346d53d98d316a71b55b14fa10ac4210 (diff) | |
Merge pull request #7637 from CrystalGamma/pr-crhelpers
PowerPC: Factor out CR helpers into POD class
Diffstat (limited to 'Source/Core/DolphinQt/Debugger/CodeWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Debugger/CodeWidget.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp index a37881e03f..af13edfb3c 100644 --- a/Source/Core/DolphinQt/Debugger/CodeWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/CodeWidget.cpp @@ -416,7 +416,8 @@ static bool WillInstructionReturn(UGeckoInstruction inst) if (inst.hex == 0x4C000064u) return true; bool counter = (inst.BO_2 >> 2 & 1) != 0 || (CTR != 0) != ((inst.BO_2 >> 1 & 1) != 0); - bool condition = inst.BO_2 >> 4 != 0 || PowerPC::GetCRBit(inst.BI_2) == (inst.BO_2 >> 3 & 1); + bool condition = + inst.BO_2 >> 4 != 0 || PowerPC::ppcState.cr.GetBit(inst.BI_2) == (inst.BO_2 >> 3 & 1); bool isBclr = inst.OPCD_7 == 0b010011 && (inst.hex >> 1 & 0b10000) != 0; return isBclr && counter && condition && !inst.LK_3; } |