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

Core: Reorder AndVariableToX86Reg parameters

This commit is contained in:
zilmar 2022-11-07 10:00:35 +10:30
parent 513ca57f46
commit ade6787e6d
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5580,13 +5580,13 @@ void CX86RecompilerOps::SPECIAL_AND()
if (Is64Bit(KnownReg) || !g_System->b32BitCore()) if (Is64Bit(KnownReg) || !g_System->b32BitCore())
{ {
Map_GPR_64bit(m_Opcode.rd, KnownReg); Map_GPR_64bit(m_Opcode.rd, KnownReg);
m_Assembler.AndVariableToX86Reg(&_GPR[UnknownReg].W[1], CRegName::GPR_Hi[UnknownReg], GetMipsRegMapHi(m_Opcode.rd)); m_Assembler.AndVariableToX86Reg(GetMipsRegMapHi(m_Opcode.rd), &_GPR[UnknownReg].W[1], CRegName::GPR_Hi[UnknownReg]);
m_Assembler.AndVariableToX86Reg(&_GPR[UnknownReg].W[0], CRegName::GPR_Lo[UnknownReg], GetMipsRegMapLo(m_Opcode.rd)); m_Assembler.AndVariableToX86Reg(GetMipsRegMapLo(m_Opcode.rd), &_GPR[UnknownReg].W[0], CRegName::GPR_Lo[UnknownReg]);
} }
else else
{ {
Map_GPR_32bit(m_Opcode.rd, IsSigned(KnownReg), KnownReg); Map_GPR_32bit(m_Opcode.rd, IsSigned(KnownReg), KnownReg);
m_Assembler.AndVariableToX86Reg(&_GPR[UnknownReg].W[0], CRegName::GPR_Lo[UnknownReg], GetMipsRegMapLo(m_Opcode.rd)); m_Assembler.AndVariableToX86Reg(GetMipsRegMapLo(m_Opcode.rd), &_GPR[UnknownReg].W[0], CRegName::GPR_Lo[UnknownReg]);
} }
} }
else else
@ -5614,9 +5614,9 @@ void CX86RecompilerOps::SPECIAL_AND()
else else
{ {
Map_GPR_64bit(m_Opcode.rd, m_Opcode.rt); Map_GPR_64bit(m_Opcode.rd, m_Opcode.rt);
m_Assembler.AndVariableToX86Reg(&_GPR[m_Opcode.rs].W[1], CRegName::GPR_Hi[m_Opcode.rs], GetMipsRegMapHi(m_Opcode.rd)); m_Assembler.AndVariableToX86Reg(GetMipsRegMapHi(m_Opcode.rd), &_GPR[m_Opcode.rs].W[1], CRegName::GPR_Hi[m_Opcode.rs]);
} }
m_Assembler.AndVariableToX86Reg(&_GPR[m_Opcode.rs].W[0], CRegName::GPR_Lo[m_Opcode.rs], GetMipsRegMapLo(m_Opcode.rd)); m_Assembler.AndVariableToX86Reg(GetMipsRegMapLo(m_Opcode.rd), &_GPR[m_Opcode.rs].W[0], CRegName::GPR_Lo[m_Opcode.rs]);
} }
} }

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

@ -152,7 +152,7 @@ void CX86Ops::AndVariableDispToX86Reg(x86Reg Reg, void * Variable, const char *
AddCode32((uint32_t)(Variable)); AddCode32((uint32_t)(Variable));
} }
void CX86Ops::AndVariableToX86Reg(void * Variable, const char * VariableName, x86Reg Reg) void CX86Ops::AndVariableToX86Reg(x86Reg Reg, void * Variable, const char * VariableName)
{ {
CodeLog(" and %s, dword ptr [%s]", x86_Name(Reg), VariableName); CodeLog(" and %s, dword ptr [%s]", x86_Name(Reg), VariableName);
AddCode16((uint16_t)(0x0523 + (Reg * 0x800))); AddCode16((uint16_t)(0x0523 + (Reg * 0x800)));

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

@ -75,7 +75,7 @@ public:
void AddX86RegToX86Reg(x86Reg Destination, x86Reg Source); void AddX86RegToX86Reg(x86Reg Destination, x86Reg Source);
void AndConstToVariable(void * Variable, const char * VariableName, uint32_t Const); void AndConstToVariable(void * Variable, const char * VariableName, uint32_t Const);
void AndConstToX86Reg(x86Reg Reg, uint32_t Const); void AndConstToX86Reg(x86Reg Reg, uint32_t Const);
void AndVariableToX86Reg(void * Variable, const char * VariableName, x86Reg Reg); void AndVariableToX86Reg(x86Reg Reg, void * Variable, const char * VariableName);
void AndVariableDispToX86Reg(x86Reg Reg, void * Variable, const char * VariableName, x86Reg AddrReg, Multipler Multiply); void AndVariableDispToX86Reg(x86Reg Reg, void * Variable, const char * VariableName, x86Reg AddrReg, Multipler Multiply);
void AndX86RegToX86Reg(x86Reg Destination, x86Reg Source); void AndX86RegToX86Reg(x86Reg Destination, x86Reg Source);
void X86HardBreakPoint(); void X86HardBreakPoint();