Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jit: Avoid a super unlikely write to zero.

Browse Source
This commit is contained in:
Unknown W. Brackets 2015-04-07 18:20:37 -07:00
parent 8afab3f94f
commit 788b9d78f8
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/MIPS/ARM/ArmCompBranch.cpp
View File

@ -509,7 +509,7 @@ void ArmJit::Comp_JumpReg(MIPSOpcode op)
}
MIPSGPReg rs = _RS;
MIPSGPReg rd = _RD;
bool andLink = (op & 0x3f) == 9;
bool andLink = (op & 0x3f) == 9 && rd != MIPS_REG_ZERO;
MIPSOpcode delaySlotOp = Memory::Read_Instruction(js.compilerPC + 4);
bool delaySlotIsNice = IsDelaySlotNiceReg(op, delaySlotOp, rs);

2
Core/MIPS/ARM64/Arm64CompBranch.cpp
View File

@ -489,7 +489,7 @@ void Arm64Jit::Comp_JumpReg(MIPSOpcode op)
}
MIPSGPReg rs = _RS;
MIPSGPReg rd = _RD;
bool andLink = (op & 0x3f) == 9;
bool andLink = (op & 0x3f) == 9 && rd != MIPS_REG_ZERO;
MIPSOpcode delaySlotOp = Memory::Read_Instruction(js.compilerPC + 4);
bool delaySlotIsNice = IsDelaySlotNiceReg(op, delaySlotOp, rs);

3
Core/MIPS/MIPSInt.cpp
View File

@ -298,7 +298,8 @@ namespace MIPSInt
DelayBranchTo(addr);
break;
case 9: //jalr
R(rd) = PC + 8;
if (rd != 0)
R(rd) = PC + 8;
DelayBranchTo(addr);
break;
}

2
Core/MIPS/x86/CompBranch.cpp
View File

@ -670,7 +670,7 @@ void Jit::Comp_JumpReg(MIPSOpcode op)
}
MIPSGPReg rs = _RS;
MIPSGPReg rd = _RD;
bool andLink = (op & 0x3f) == 9;
bool andLink = (op & 0x3f) == 9 && rd != MIPS_REG_ZERO;
MIPSOpcode delaySlotOp = Memory::Read_Instruction(js.compilerPC + 4);
bool delaySlotIsNice = IsDelaySlotNiceReg(op, delaySlotOp, rs);