mirror of
https://github.com/yuzu-mirror/yuzu
synced 2024-12-19 02:03:06 +00:00
Merge pull request #2466 from yuzu-emu/mme-exit-delay-slot
GPU/MMEInterpreter: Ignore the 'exit' flag when it's executed inside a delay slot.
This commit is contained in:
commit
9175bffbdb
1 changed files with 3 additions and 3 deletions
|
@ -118,10 +118,10 @@ bool MacroInterpreter::Step(u32 offset, bool is_delay_slot) {
|
||||||
static_cast<u32>(opcode.operation.Value()));
|
static_cast<u32>(opcode.operation.Value()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opcode.is_exit) {
|
// 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) {
|
||||||
// Exit has a delay slot, execute the next instruction
|
// Exit has a delay slot, execute the next instruction
|
||||||
// Note: Executing an exit during a branch delay slot will cause the instruction at the
|
|
||||||
// branch target to be executed before exiting.
|
|
||||||
Step(offset, true);
|
Step(offset, true);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue