diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2019-05-12 16:38:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-12 16:38:51 -0500 |
| commit | 9ef45f00bf452170c95255f5a3a566d5af91c102 (patch) | |
| tree | ee78395d11dbd3e6e97af07190503200e84e77e9 /src/video_core/macro_interpreter.cpp | |
| parent | 7cb17834c76df6fc394d8b1b29e8f752f966710b (diff) | |
GPU/MMEInterpreter: Ignore the 'exit' flag when it's executed inside a delay slot.
It seems instructions marked with the 'exit' flag will not cause an exit when executed within a delay slot.
This was hwtested by fincs.
Diffstat (limited to 'src/video_core/macro_interpreter.cpp')
| -rw-r--r-- | src/video_core/macro_interpreter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 524d9ea5a9..fbea107ca3 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp @@ -118,10 +118,10 @@ bool MacroInterpreter::Step(u32 offset, bool is_delay_slot) { static_cast<u32>(opcode.operation.Value())); } - if (opcode.is_exit) { + // An instruction with the Exit flag will not actually + // cause an exit if it's executed inside a delay slot. + if (opcode.is_exit && !is_delay_slot) { // Exit has a delay slot, execute the next instruction - // Note: Executing an exit during a branch delay slot will cause the instruction at the - // branch target to be executed before exiting. Step(offset, true); return false; } |