summaryrefslogtreecommitdiffstats
path: root/src/video_core/macro_interpreter.cpp
diff options
context:
space:
mode:
authorFernando Sahmkow <fsahmkow27@gmail.com>2019-09-15 12:17:04 +0200
committerGitHub <noreply@github.com>2019-09-15 12:17:04 +0200
commitb8b1747704a612145655a1391c1ebf4d1f9e5ba6 (patch)
tree5f85729ae6532a678532ae20b9422fb0c2e84b73 /src/video_core/macro_interpreter.cpp
parentMerge pull request #2857 from ReinUsesLisp/surface-srgb (diff)
parentmaxwell_3d: Update firmware 4 call stub commentary (diff)
downloadyuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar.gz
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar.bz2
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar.lz
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar.xz
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.tar.zst
yuzu-b8b1747704a612145655a1391c1ebf4d1f9e5ba6.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 4e1cb98db..62afc0d11 100644
--- a/src/video_core/macro_interpreter.cpp
+++ b/src/video_core/macro_interpreter.cpp
@@ -131,9 +131,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;