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

Recompiler: Fix up protection of op in DADDU

This commit is contained in:
zilmar 2013-03-12 18:40:50 +11:00
parent 2d1e5f03cc
commit 7b70ba0da3
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3561,13 +3561,13 @@ void CRecompilerOps::SPECIAL_DADD (void) {
int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs; int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs;
int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt; int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt;
if (IsMapped(source2)) { ProtectGPR(source2); }
Map_GPR_64bit(m_Opcode.rd,source1); Map_GPR_64bit(m_Opcode.rd,source1);
if (IsConst(source2)) { if (IsConst(source2)) {
AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2)); AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2)); AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2));
} else if (IsMapped(source2)) { } else if (IsMapped(source2)) {
x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE); x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE);
ProtectGPR(source2);
AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2)); AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg); AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
} else { } else {
@ -3597,13 +3597,13 @@ void CRecompilerOps::SPECIAL_DADDU (void) {
int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs; int source1 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rt:m_Opcode.rs;
int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt; int source2 = m_Opcode.rd == m_Opcode.rt?m_Opcode.rs:m_Opcode.rt;
if (IsMapped(source2)) { ProtectGPR(source2); }
Map_GPR_64bit(m_Opcode.rd,source1); Map_GPR_64bit(m_Opcode.rd,source1);
if (IsConst(source2)) { if (IsConst(source2)) {
AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2)); AddConstToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(source2));
AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2)); AddConstToX86Reg(GetMipsRegMapHi(m_Opcode.rd),GetMipsRegHi(source2));
} else if (IsMapped(source2)) { } else if (IsMapped(source2)) {
x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE); x86Reg HiReg = Is64Bit(source2)?GetMipsRegMapHi(source2):Map_TempReg(x86_Any,source2,TRUE);
ProtectGPR(source2);
AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2)); AddX86RegToX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegMapLo(source2));
AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg); AdcX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
} else { } else {
@ -3639,10 +3639,8 @@ void CRecompilerOps::SPECIAL_DSUB (void) {
SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg); SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
return; return;
} }
if (IsMapped(m_Opcode.rt))
{ if (IsMapped(m_Opcode.rt)) { ProtectGPR(m_Opcode.rt); }
ProtectGPR(m_Opcode.rt);
}
Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs); Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs);
if (IsConst(m_Opcode.rt)) { if (IsConst(m_Opcode.rt)) {
SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt)); SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));
@ -3684,10 +3682,7 @@ void CRecompilerOps::SPECIAL_DSUBU (void) {
SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg); SbbX86RegToX86Reg(GetMipsRegMapHi(m_Opcode.rd),HiReg);
return; return;
} }
if (IsMapped(m_Opcode.rt)) if (IsMapped(m_Opcode.rt)) { ProtectGPR(m_Opcode.rt); }
{
ProtectGPR(m_Opcode.rt);
}
Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs); Map_GPR_64bit(m_Opcode.rd,m_Opcode.rs);
if (IsConst(m_Opcode.rt)) { if (IsConst(m_Opcode.rt)) {
SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt)); SubConstFromX86Reg(GetMipsRegMapLo(m_Opcode.rd),GetMipsRegLo(m_Opcode.rt));