diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-09-15 06:17:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 06:17:04 -0400 |
| commit | b8b1747704a612145655a1391c1ebf4d1f9e5ba6 (patch) | |
| tree | 5f85729ae6532a678532ae20b9422fb0c2e84b73 /src/video_core/macro_interpreter.cpp | |
| parent | daae327e864e169e6795d1ac313a87b32360c21e (diff) | |
| parent | 193bfefce4d40c9b3f244d416a0c24da276b0869 (diff) | |
Merge pull request #2824 from ReinUsesLisp/mme
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 4e1cb98dbe..62afc0d116 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp @@ -131,9 +131,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; |