diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp index c93a44890..218501098 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp @@ -2996,7 +2996,7 @@ void CX86RecompilerOps::LH_KnownAddress(CX86Ops::x86Reg Reg, uint32_t VAddr, boo } else { - m_Assembler.MoveZxVariableToX86regHalf((PAddr ^ 2) + g_MMU->Rdram(), stdstr_f("RDRAM + (%X ^ 2)", PAddr).c_str(), Reg); + m_Assembler.MoveZxVariableToX86regHalf(Reg, (PAddr ^ 2) + g_MMU->Rdram(), stdstr_f("RDRAM + (%X ^ 2)", PAddr).c_str()); } } else diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp index c72eb98fc..70b9e605f 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp @@ -1715,7 +1715,7 @@ void CX86Ops::MoveZxVariableToX86regByte(x86Reg Reg, void * Variable, const char AddCode32((uint32_t)(Variable)); } -void CX86Ops::MoveZxVariableToX86regHalf(void * Variable, const char * VariableName, x86Reg Reg) +void CX86Ops::MoveZxVariableToX86regHalf(x86Reg Reg, void * Variable, const char * VariableName) { CodeLog(" movzx %s, word ptr [%s]", x86_Name(Reg), VariableName); diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h index 6e4d3b9e2..3bf921e45 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h +++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h @@ -158,7 +158,7 @@ public: void MoveZxByteX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2); void MoveZxHalfX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2); void MoveZxVariableToX86regByte(x86Reg Reg, void * Variable, const char * VariableName); - void MoveZxVariableToX86regHalf(void * Variable, const char * VariableName, x86Reg Reg); + void MoveZxVariableToX86regHalf(x86Reg Reg, void * Variable, const char * VariableName); void MulX86reg(x86Reg Reg); void NotX86Reg(x86Reg Reg); void OrConstToVariable(uint32_t Const, void * Variable, const char * VariableName);