ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RSP: Better handle delay slot at 0xFFC

This commit is contained in:
zilmar 2024-06-13 14:54:44 +09:30
parent c3d6ed1a0c
commit 303af24bde
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Project64-rsp-core/Recompiler/RspRecompilerCPU.cpp
View File

@ -890,11 +890,11 @@ void CompilerRSPBlock(void)
break; break;
case RSPPIPELINE_DELAY_SLOT: case RSPPIPELINE_DELAY_SLOT:
NextInstruction = RSPPIPELINE_DELAY_SLOT_DONE; NextInstruction = RSPPIPELINE_DELAY_SLOT_DONE;
CompilePC -= 4; CompilePC = (CompilePC - 4 & 0xFFC);
break; break;
case RSPPIPELINE_DELAY_SLOT_EXIT: case RSPPIPELINE_DELAY_SLOT_EXIT:
NextInstruction = RSPPIPELINE_DELAY_SLOT_EXIT_DONE; NextInstruction = RSPPIPELINE_DELAY_SLOT_EXIT_DONE;
CompilePC -= 4; CompilePC = (CompilePC - 4 & 0xFFC);
break; break;
case RSPPIPELINE_FINISH_SUB_BLOCK: case RSPPIPELINE_FINISH_SUB_BLOCK:
NextInstruction = RSPPIPELINE_NORMAL; NextInstruction = RSPPIPELINE_NORMAL;
@ -931,7 +931,7 @@ void CompilerRSPBlock(void)
CompilePC = 0; CompilePC = 0;
EndPC = *PrgCount; EndPC = *PrgCount;
} }
} while (NextInstruction != RSPPIPELINE_FINISH_BLOCK && (CompilePC < EndPC || NextInstruction == RSPPIPELINE_DELAY_SLOT)); } while (NextInstruction != RSPPIPELINE_FINISH_BLOCK && (CompilePC < EndPC || NextInstruction == RSPPIPELINE_DELAY_SLOT || NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE));
CPU_Message("===== End of recompiled code ====="); CPU_Message("===== End of recompiled code =====");
if (Compiler.bReOrdering) if (Compiler.bReOrdering)