summaryrefslogtreecommitdiff
path: root/src/video_core/macro_interpreter.cpp
diff options
context:
space:
mode:
authorGravatar Fernando Sahmkow2019-05-19 16:04:44 -0400
committerGravatar Fernando Sahmkow2019-05-19 16:04:44 -0400
commit911fafb967b3e35114415a945d4664764868fd1b (patch)
tree5750a24ba00d7dffe79d8a6488878c1b6d33a5f4 /src/video_core/macro_interpreter.cpp
parentMerge pull request #2441 from ReinUsesLisp/al2p (diff)
downloadyuzu-911fafb967b3e35114415a945d4664764868fd1b.tar.gz
yuzu-911fafb967b3e35114415a945d4664764868fd1b.tar.xz
yuzu-911fafb967b3e35114415a945d4664764868fd1b.zip
Revert #2466
This reverts a tested behavior on delay slots not exiting if the exit flag is set. Currently new tests are required in order to ensure this behavior.
Diffstat (limited to 'src/video_core/macro_interpreter.cpp')
-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) {
120 120
121 // An instruction with the Exit flag will not actually 121 // An instruction with the Exit flag will not actually
122 // cause an exit if it's executed inside a delay slot. 122 // cause an exit if it's executed inside a delay slot.
123 if (opcode.is_exit && !is_delay_slot) { 123 // TODO(Blinkhawk): Reversed to always exit. The behavior explained above requires further
124 // testing on the MME code.
125 if (opcode.is_exit) {
124 // Exit has a delay slot, execute the next instruction 126 // Exit has a delay slot, execute the next instruction
125 Step(offset, true); 127 Step(offset, true);
126 return false; 128 return false;