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

Merge pull request #548 from LegendOfDragoon/master 

Implement edge case in SPECIAL_DSRL32
This commit is contained in:
zilmar 2015-07-29 07:40:23 +10:00
parent 9f52cfd348 2f812afca7
commit 7121d78a2f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp
View File

@ -3933,9 +3933,16 @@ void CRecompilerOps::SPECIAL_DSRL32() {
if (IsConst(m_Opcode.rt)) { if (IsConst(m_Opcode.rt)) {
if (m_Opcode.rt != m_Opcode.rd) if (m_Opcode.rt != m_Opcode.rd)
UnMap_GPR(m_Opcode.rd, false); UnMap_GPR(m_Opcode.rd, false);
m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_ZERO); if (m_Opcode.sa == 0) {
m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, (DWORD)(GetMipsReg(m_Opcode.rt) >> (m_Opcode.sa + 32))); MIPS_DWORD Value;
Value.UW[0] = Value.UW[1] = GetMipsRegHi(m_Opcode.rt);
m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_64);
m_RegWorkingSet.SetMipsReg(m_Opcode.rd, Value.UDW);
} else {
m_RegWorkingSet.SetMipsRegState(m_Opcode.rd,CRegInfo::STATE_CONST_32_ZERO);
m_RegWorkingSet.SetMipsRegLo(m_Opcode.rd, (DWORD)(GetMipsReg(m_Opcode.rt) >> (m_Opcode.sa + 32)));
}
} else if (IsMapped(m_Opcode.rt)) { } else if (IsMapped(m_Opcode.rt)) {
ProtectGPR(m_Opcode.rt); ProtectGPR(m_Opcode.rt);
if (Is64Bit(m_Opcode.rt)) { if (Is64Bit(m_Opcode.rt)) {