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

Core: Fix up labels in CX86RecompilerOps::COP1_S_CVT

This commit is contained in:
zilmar 2024-12-19 21:59:42 +10:30
parent 57f278416e
commit 7e74b98d5b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11590,13 +11590,14 @@ void CX86RecompilerOps::COP1_S_CVT(CRegBase::FPU_ROUND RoundMethod, CRegInfo::FP
m_Assembler.mov(asmjit::x86::eax, asmjit::x86::dword_ptr(fsRegPointer, 4)); m_Assembler.mov(asmjit::x86::eax, asmjit::x86::dword_ptr(fsRegPointer, 4));
m_Assembler.adc(asmjit::x86::eax, 0x800000); m_Assembler.adc(asmjit::x86::eax, 0x800000);
m_Assembler.cmp(asmjit::x86::eax, 0xFFFFFF); m_Assembler.cmp(asmjit::x86::eax, 0xFFFFFF);
asmjit::Label UnimplementedOperationLabel = m_Assembler.newLabel();
asmjit::Label ValidValueLabel = m_Assembler.newLabel(); asmjit::Label ValidValueLabel = m_Assembler.newLabel();
m_Assembler.JaLabel("ValidValue", UnimplementedOperationLabel); asmjit::Label ValidValueLabel2 = m_Assembler.newLabel();
m_Assembler.JbLabel("UnimplementedOperationLabel", ValidValueLabel); asmjit::Label UnimplementedOperationLabel = m_Assembler.newLabel();
m_Assembler.JaLabel("ValidValue", ValidValueLabel);
m_Assembler.JbLabel("UnimplementedOperationLabel", UnimplementedOperationLabel);
m_Assembler.cmp(asmjit::x86::eax, 0xFFFFFFFF); m_Assembler.cmp(asmjit::x86::eax, 0xFFFFFFFF);
m_Assembler.JbeLabel("ValidValue", ValidValueLabel); m_Assembler.JbeLabel("ValidValue", ValidValueLabel2);
m_Assembler.bind(UnimplementedOperationLabel); m_Assembler.bind(ValidValueLabel);
CRegInfo ExitRegSet = m_RegWorkingSet; CRegInfo ExitRegSet = m_RegWorkingSet;
if (ExitRegSet.IsFPStatusRegMapped()) if (ExitRegSet.IsFPStatusRegMapped())
{ {
@ -11608,7 +11609,8 @@ void CX86RecompilerOps::COP1_S_CVT(CRegBase::FPU_ROUND RoundMethod, CRegInfo::FP
} }
ExitRegSet.SetBlockCycleCount(ExitRegSet.GetBlockCycleCount() + g_System->CountPerOp()); ExitRegSet.SetBlockCycleCount(ExitRegSet.GetBlockCycleCount() + g_System->CountPerOp());
CompileExit(m_CompilePC, m_CompilePC, ExitRegSet, ExitReason_ExceptionFloatingPoint, false, &CX86Ops::JmpLabel); CompileExit(m_CompilePC, m_CompilePC, ExitRegSet, ExitReason_ExceptionFloatingPoint, false, &CX86Ops::JmpLabel);
m_Assembler.bind(ValidValueLabel); m_Assembler.bind(UnimplementedOperationLabel);
m_Assembler.bind(ValidValueLabel2);
m_Assembler.fpuLoadIntegerQwordFromX86Reg(m_RegWorkingSet.StackTopPos(), fsRegPointer); m_Assembler.fpuLoadIntegerQwordFromX86Reg(m_RegWorkingSet.StackTopPos(), fsRegPointer);
} }
else else

2
Source/Project64-core/N64System/Recompiler/x86/x86RegInfo.cpp
View File

@ -1259,7 +1259,7 @@ void CX86RegInfo::PrepareFPTopToBe(int32_t Reg, int32_t RegToLoad, FPU_STATE For
case FPU_Float: case FPU_Float:
m_Assembler.MoveVariableToX86reg(TempReg, &g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str()); m_Assembler.MoveVariableToX86reg(TempReg, &g_Reg->m_FPR_S[RegToLoad], stdstr_f("m_FPR_S[%d]", RegToLoad).c_str());
m_Assembler.fpuLoadDwordFromX86Reg(StackTopPos(), TempReg); m_Assembler.fpuLoadDwordFromX86Reg(StackTopPos(), TempReg);
break; break;
case FPU_FloatLow: case FPU_FloatLow:
m_Assembler.MoveVariableToX86reg(TempReg, &g_Reg->m_FPR_S_L[RegToLoad], stdstr_f("m_FPR_S_L[%d]", RegToLoad).c_str()); m_Assembler.MoveVariableToX86reg(TempReg, &g_Reg->m_FPR_S_L[RegToLoad], stdstr_f("m_FPR_S_L[%d]", RegToLoad).c_str());
m_Assembler.fpuLoadDwordFromX86Reg(StackTopPos(), TempReg); m_Assembler.fpuLoadDwordFromX86Reg(StackTopPos(), TempReg);