Просмотр исходного кода

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.
Fernando Sahmkow 7 лет назад
Родитель
Сommit
911fafb967
1 измененных файлов с 3 добавлено и 1 удалено
  1. 3 1
      src/video_core/macro_interpreter.cpp

+ 3 - 1
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;