notsoyuzu
/
yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Hexagon12 2019-05-19 15:14:41 +01:00 committed by GitHub
parent ac3775e6ae 9ef45f00bf
commit 9175bffbdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video_core/macro_interpreter.cpp
View File

@ -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;
} }