diff options
| author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-05-19 16:04:44 -0400 |
|---|---|---|
| committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2019-05-19 16:04:44 -0400 |
| commit | 911fafb967b3e35114415a945d4664764868fd1b (patch) | |
| tree | 5750a24ba00d7dffe79d8a6488878c1b6d33a5f4 /src/video_core/macro_interpreter.cpp | |
| parent | d49efbfb4aa4e935f6c753871d6af6534701f542 (diff) | |
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.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/video_core/macro_interpreter.cpp b/src/video_core/macro_interpreter.cpp index fbea107ca3..c766ed692b 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; |