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

RSP: Fix up recompiler jumps JAL, BLTZAL, BGEZAL

This commit is contained in:
zilmar 2024-07-06 19:33:10 +09:30
parent 4125774be8
commit 9b38977b31
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Project64-rsp-core/Recompiler/RspRecompilerOps.cpp
View File

@ -213,7 +213,7 @@ void Compile_JAL(void)
if (NextInstruction == RSPPIPELINE_NORMAL) if (NextInstruction == RSPPIPELINE_NORMAL)
{ {
CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str()); CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str());
MoveConstToVariable(CompilePC + 8, &RSP_GPR[31].UW, "RA.W"); MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
NextInstruction = RSPPIPELINE_DO_DELAY_SLOT; NextInstruction = RSPPIPELINE_DO_DELAY_SLOT;
} }
else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE) else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE)
@ -2058,14 +2058,15 @@ void Compile_RegImm_BLTZAL(void)
if (NextInstruction == RSPPIPELINE_NORMAL) if (NextInstruction == RSPPIPELINE_NORMAL)
{ {
CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str()); CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str());
MoveConstToVariable(CompilePC + 8, &RSP_GPR[31].UW, "RA.W");
if (RSPOpC.rs == 0) if (RSPOpC.rs == 0)
{ {
MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
NextInstruction = RSPPIPELINE_DO_DELAY_SLOT; NextInstruction = RSPPIPELINE_DO_DELAY_SLOT;
return; return;
} }
CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs)); CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs));
SetlVariable(&BranchCompare, "BranchCompare"); SetlVariable(&BranchCompare, "BranchCompare");
MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
NextInstruction = RSPPIPELINE_DO_DELAY_SLOT; NextInstruction = RSPPIPELINE_DO_DELAY_SLOT;
} }
else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE) else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE)
@ -2103,9 +2104,9 @@ void Compile_RegImm_BGEZAL(void)
if (NextInstruction == RSPPIPELINE_NORMAL) if (NextInstruction == RSPPIPELINE_NORMAL)
{ {
CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str()); CPU_Message(" %X %s", CompilePC, RSPInstruction(CompilePC, RSPOpC.Value).NameAndParam().c_str());
MoveConstToVariable(CompilePC + 8, &RSP_GPR[31].UW, "RA.W");
if (RSPOpC.rs == 0) if (RSPOpC.rs == 0)
{ {
MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
NextInstruction = RSPPIPELINE_DO_DELAY_SLOT; NextInstruction = RSPPIPELINE_DO_DELAY_SLOT;
return; return;
} }
@ -2117,6 +2118,7 @@ void Compile_RegImm_BGEZAL(void)
} }
CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs)); CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs));
SetgeVariable(&BranchCompare, "BranchCompare"); SetgeVariable(&BranchCompare, "BranchCompare");
MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
NextInstruction = RSPPIPELINE_DO_DELAY_SLOT; NextInstruction = RSPPIPELINE_DO_DELAY_SLOT;
} }
else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE) else if (NextInstruction == RSPPIPELINE_DELAY_SLOT_DONE)
@ -2133,6 +2135,7 @@ void Compile_RegImm_BGEZAL(void)
if (!bDelayAffect) if (!bDelayAffect)
{ {
CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs)); CompConstToVariable(0, &RSP_GPR[RSPOpC.rs].W, GPR_Name(RSPOpC.rs));
MoveConstToVariable((CompilePC + 8) & 0xFFC, &RSP_GPR[31].UW, "RA.W");
JgeLabel32("BranchGreaterEqual", 0); JgeLabel32("BranchGreaterEqual", 0);
} }
else else