From 5f309b88db87e479378ea4695fe69a99fd8e2919 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Sat, 31 Aug 2019 17:43:19 -0300 Subject: Revert "Revert #2466" and stub FirmwareCall 4 --- src/video_core/macro_interpreter.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/video_core/macro_interpreter.cpp') diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 9f59a2dc1..a891e412a 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; -- cgit v1.2.3