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

Core: Fix bug in div for recompiler

This commit is contained in:
zilmar 2022-08-29 08:33:13 +09:30
parent 6782599687
commit b88a1ccc1e
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
View File

@ -4817,14 +4817,7 @@ void CX86RecompilerOps::SPECIAL_DIV()
if (!IsConst(m_Opcode.rs)) if (!IsConst(m_Opcode.rs))
{ {
if (IsMapped(m_Opcode.rt)) m_Assembler.CompConstToX86reg(DivReg, 0);
{
m_Assembler.CompConstToX86reg(GetMipsRegMapLo(m_Opcode.rt), 0);
}
else
{
m_Assembler.CompConstToVariable(0, &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
}
m_Assembler.JneLabel8(stdstr_f("NotDiv0_%08X", m_CompilePC).c_str(), 0); m_Assembler.JneLabel8(stdstr_f("NotDiv0_%08X", m_CompilePC).c_str(), 0);
JumpNotDiv0 = *g_RecompPos - 1; JumpNotDiv0 = *g_RecompPos - 1;
@ -4975,18 +4968,11 @@ void CX86RecompilerOps::SPECIAL_DIVU()
m_RegWorkingSet.SetX86Protected(CX86Ops::x86_EAX, false); m_RegWorkingSet.SetX86Protected(CX86Ops::x86_EAX, false);
Map_TempReg(CX86Ops::x86_EAX, m_Opcode.rs, false); Map_TempReg(CX86Ops::x86_EAX, m_Opcode.rs, false);
CX86Ops::x86Reg DivReg = Map_TempReg(CX86Ops::x86_Any, m_Opcode.rt, false); CX86Ops::x86Reg DivReg = IsMapped(m_Opcode.rt) ? GetMipsRegMapLo(m_Opcode.rt) : Map_TempReg(CX86Ops::x86_Any, m_Opcode.rt, false);
if (!IsConst(m_Opcode.rt)) if (!IsConst(m_Opcode.rt))
{ {
if (IsMapped(m_Opcode.rt)) m_Assembler.CompConstToX86reg(DivReg, 0);
{
m_Assembler.CompConstToX86reg(GetMipsRegMapLo(m_Opcode.rt), 0);
}
else
{
m_Assembler.CompConstToVariable(0, &_GPR[m_Opcode.rt].W[0], CRegName::GPR_Lo[m_Opcode.rt]);
}
m_Assembler.JneLabel8("NoExcept", 0); m_Assembler.JneLabel8("NoExcept", 0);
uint8_t * JumpNoExcept = *g_RecompPos - 1; uint8_t * JumpNoExcept = *g_RecompPos - 1;