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

Core: rearrange TestConstToX86Reg parameters

This commit is contained in:
zilmar 2022-11-07 16:22:51 +10:30
parent ce939100c5
commit fe1f99ae1c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7906,12 +7906,12 @@ void CX86RecompilerOps::COP1_S_CMP()
m_Assembler.AndConstToVariable(&_FPCR[31], "_FPCR[31]", (uint32_t)~FPCSR_C);
m_Assembler.fpuStoreStatus();
CX86Ops::x86Reg Reg = Map_TempReg(CX86Ops::x86_Unknown, 0, false, true);
m_Assembler.TestConstToX86Reg(cmp, CX86Ops::x86_EAX);
m_Assembler.TestConstToX86Reg(CX86Ops::x86_EAX, cmp);
m_Assembler.Setnz(Reg);
if (cmp != 0)
{
m_Assembler.TestConstToX86Reg(cmp, CX86Ops::x86_EAX);
m_Assembler.TestConstToX86Reg(CX86Ops::x86_EAX, cmp);
m_Assembler.Setnz(Reg);
if ((m_Opcode.funct & 1) != 0)
@ -8271,11 +8271,11 @@ void CX86RecompilerOps::COP1_D_CMP()
m_Assembler.AndConstToVariable(&_FPCR[31], "_FPCR[31]", (uint32_t)~FPCSR_C);
m_Assembler.fpuStoreStatus();
CX86Ops::x86Reg Reg = Map_TempReg(CX86Ops::x86_Unknown, 0, false, true);
m_Assembler.TestConstToX86Reg(cmp, CX86Ops::x86_EAX);
m_Assembler.TestConstToX86Reg(CX86Ops::x86_EAX, cmp);
m_Assembler.Setnz(Reg);
if (cmp != 0)
{
m_Assembler.TestConstToX86Reg(cmp, CX86Ops::x86_EAX);
m_Assembler.TestConstToX86Reg(CX86Ops::x86_EAX, cmp);
m_Assembler.Setnz(Reg);
if ((m_Opcode.funct & 1) != 0)
@ -9754,7 +9754,7 @@ void CX86RecompilerOps::CompileLoadMemoryValue(CX86Ops::x86Reg AddressReg, CX86O
if (ValueSize == 16)
{
m_Assembler.MoveX86regToVariable(&m_TempValue32, "TempValue32", AddressReg);
m_Assembler.TestConstToX86Reg(1, AddressReg);
m_Assembler.TestConstToX86Reg(AddressReg, 1);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, ExitReason_AddressErrorExceptionRead32, false, &CX86Ops::JneLabel32);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
@ -9762,7 +9762,7 @@ void CX86RecompilerOps::CompileLoadMemoryValue(CX86Ops::x86Reg AddressReg, CX86O
else if (ValueSize == 32)
{
m_Assembler.MoveX86regToVariable(&m_TempValue32, "TempValue32", AddressReg);
m_Assembler.TestConstToX86Reg(3, AddressReg);
m_Assembler.TestConstToX86Reg(AddressReg, 3);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
CompileExit(m_CompilePC, m_CompilePC, m_RegWorkingSet, ExitReason_AddressErrorExceptionRead32, false, &CX86Ops::JneLabel32);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());

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

@ -2567,7 +2567,7 @@ void CX86Ops::SubX86RegToX86Reg(x86Reg Destination, x86Reg Source)
AddCode16(x86Command);
}
void CX86Ops::TestConstToX86Reg(uint32_t Const, x86Reg Reg)
void CX86Ops::TestConstToX86Reg(x86Reg Reg, uint32_t Const)
{
CodeLog(" test %s, 0x%X", x86_Name(Reg), Const);

2
Source/Project64-core/N64System/Recompiler/x86/x86ops.h
View File

@ -201,7 +201,7 @@ public:
void SubConstFromX86Reg(x86Reg Reg, uint32_t Const);
void SubVariableFromX86reg(x86Reg Reg, void * Variable, const char * VariableName);
void SubX86RegToX86Reg(x86Reg Destination, x86Reg Source);
void TestConstToX86Reg(uint32_t Const, x86Reg Reg);
void TestConstToX86Reg(x86Reg Reg, uint32_t Const);
void TestVariable(uint32_t Const, void * Variable, const char * VariableName);
void TestX86RegToX86Reg(x86Reg Destination, x86Reg Source);
void TestX86ByteRegToX86Reg(x86Reg Destination, x86Reg Source);