From 911fafb967b3e35114415a945d4664764868fd1b Mon Sep 17 00:00:00 2001 From: Fernando Sahmkow Date: Sun, 19 May 2019 16:04:44 -0400 Subject: [PATCH] Revert #2466 This reverts a tested behavior on delay slots not exiting if the exit flag is set. Currently new tests are required in order to ensure this behavior. --- src/video_core/macro_interpreter.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index fbea107ca3..c766ed692b 100644 --- a/src/video_core/macro_interpreter.cpp +++ b/src/video_core/macro_interpreter.cpp @@ -120,7 +120,9 @@ 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. - if (opcode.is_exit && !is_delay_slot) { + // TODO(Blinkhawk): Reversed to always exit. The behavior explained above requires further + // testing on the MME code. + if (opcode.is_exit) { // Exit has a delay slot, execute the next instruction Step(offset, true); return false;