summaryrefslogtreecommitdiffstats
path: root/src/video_core/macro_interpreter.cpp
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2019-08-31 22:43:19 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2019-09-04 06:55:45 +0200
commit5f309b88db87e479378ea4695fe69a99fd8e2919 (patch)
tree618d04864352c9cf992b3a74c42793aa7ec966f4 /src/video_core/macro_interpreter.cpp
parentMerge pull request #2835 from chris062689/master (diff)
downloadyuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar.gz
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar.bz2
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar.lz
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar.xz
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.tar.zst
yuzu-5f309b88db87e479378ea4695fe69a99fd8e2919.zip
Diffstat (limited to 'src/video_core/macro_interpreter.cpp')
-rw-r--r--src/video_core/macro_interpreter.cpp4
1 files changed, 1 insertions, 3 deletions
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;