Merge pull request #2824 from ReinUsesLisp/mme

Revert "Revert #2466" and stub FirmwareCall 4
This commit is contained in:
Fernando Sahmkow
2019-09-15 06:17:04 -04:00
committed by GitHub
3 changed files with 20 additions and 4 deletions

View File

@ -131,9 +131,7 @@ 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.
// TODO(Blinkhawk): Reversed to always exit. The behavior explained above requires further
// testing on the MME code.
if (opcode.is_exit) {
if (opcode.is_exit && !is_delay_slot) {
// Exit has a delay slot, execute the next instruction
Step(offset, true);
return false;