summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHexagon12 <Hexagon12@users.noreply.github.com>2019-05-19 21:23:06 +0100
committerGitHub <noreply@github.com>2019-05-19 21:23:06 +0100
commit73ee85e9ae63368719b3a651de1f91e6bf3e88aa (patch)
tree5750a24ba00d7dffe79d8a6488878c1b6d33a5f4
parentd49efbfb4aa4e935f6c753871d6af6534701f542 (diff)
parent911fafb967b3e35114415a945d4664764868fd1b (diff)
Merge pull request #2500 from FernandoS27/revert-2466
Revert #2466
-rw-r--r--src/video_core/macro_interpreter.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp
index fbea107ca..c766ed692 100644
--- a/src/video_core/macro_interpreter.cpp
+++ b/src/video_core/macro_interpreter.cpp
@@ -120,7 +120,9 @@ 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.
- if (opcode.is_exit && !is_delay_slot) {
+ // TODO(Blinkhawk): Reversed to always exit. The behavior explained above requires further
+ // testing on the MME code.
+ if (opcode.is_exit) {
// Exit has a delay slot, execute the next instruction
Step(offset, true);
return false;