summaryrefslogtreecommitdiffstats
path: root/src/video_core
diff options
context:
space:
mode:
authorSebastian Valle <subv2112@gmail.com>2019-05-12 23:38:51 +0200
committerGitHub <noreply@github.com>2019-05-12 23:38:51 +0200
commit9ef45f00bf452170c95255f5a3a566d5af91c102 (patch)
treeee78395d11dbd3e6e97af07190503200e84e77e9 /src/video_core
parentMerge pull request #2437 from lioncash/audctl (diff)
downloadyuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar.gz
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar.bz2
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar.lz
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar.xz
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.tar.zst
yuzu-9ef45f00bf452170c95255f5a3a566d5af91c102.zip
Diffstat (limited to 'src/video_core')
-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;
}