diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-08-31 17:43:19 -0300 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-09-04 01:55:45 -0300 |
| commit | 5f309b88db87e479378ea4695fe69a99fd8e2919 (patch) | |
| tree | 618d04864352c9cf992b3a74c42793aa7ec966f4 /src/video_core/macro_interpreter.cpp | |
| parent | 922c7f4e510c12a7e207ba08904c2523d99edd55 (diff) | |
Revert "Revert #2466" and stub FirmwareCall 4
Diffstat (limited to 'src/video_core/macro_interpreter.cpp')
| -rw-r--r-- | src/video_core/macro_interpreter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 9f59a2dc1f..a891e412a4 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp @@ -124,9 +124,7 @@ bool MacroInterpreter::Step(u32 offset, bool is_delay_slot) { // An instruction with the Exit flag will not actually // cause an exit if it's executed inside a delay slot. - // TODO(Blinkhawk): Reversed to always exit. The behavior explained above requires further - // testing on the MME code. - if (opcode.is_exit) { + if (opcode.is_exit && !is_delay_slot) { // Exit has a delay slot, execute the next instruction Step(offset, true); return false; |