summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHexagon12 <Hexagon12@users.noreply.github.com>2019-05-19 16:14:41 +0200
committerGitHub <noreply@github.com>2019-05-19 16:14:41 +0200
commit9175bffbdbccce15e40c345d13207e53a43a7663 (patch)
tree8636b77dceb0213f354144aeb64755965983ad03
parentMerge pull request #2468 from lioncash/deduction (diff)
parentGPU/MMEInterpreter: Ignore the 'exit' flag when it's executed inside a delay slot. (diff)
downloadyuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar.gz
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar.bz2
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar.lz
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar.xz
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.tar.zst
yuzu-9175bffbdbccce15e40c345d13207e53a43a7663.zip
-rw-r--r--src/video_core/macro_interpreter.cpp6
1 files 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<u32>(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;
}