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.
This commit is contained in:
parent
d49efbfb4a
commit
911fafb967
|
@ -120,7 +120,9 @@ bool MacroInterpreter::Step(u32 offset, bool is_delay_slot) {
|
||||||
|
|
||||||
// An instruction with the Exit flag will not actually
|
// An instruction with the Exit flag will not actually
|
||||||
// cause an exit if it's executed inside a delay slot.
|
// 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
|
// Exit has a delay slot, execute the next instruction
|
||||||
Step(offset, true);
|
Step(offset, true);
|
||||||
return false;
|
return false;
|
||||||
|
|
Reference in New Issue