From 9ef45f00bf452170c95255f5a3a566d5af91c102 Mon Sep 17 00:00:00 2001 From: Sebastian Valle Date: Sun, 12 May 2019 16:38:51 -0500 Subject: [PATCH] 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. --- src/video_core/macro_interpreter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index 524d9ea5a..fbea107ca 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(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; }