From fe7b8afa928bd29a538555e40c94cd94f204d207 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 7 Nov 2022 13:37:29 +1030 Subject: [PATCH] Core: Rearrange MoveSxByteX86regPointerToX86reg parameters --- .../N64System/Recompiler/x86/x86RecompilerOps.cpp | 2 +- Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp | 2 +- Source/Project64-core/N64System/Recompiler/x86/x86ops.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp index 91714be2d..080807e6f 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp @@ -9840,7 +9840,7 @@ void CX86RecompilerOps::CompileLoadMemoryValue(CX86Ops::x86Reg AddressReg, CX86O } else if (SignExtend) { - m_Assembler.MoveSxByteX86regPointerToX86reg(AddressReg, TempReg, ValueReg); + m_Assembler.MoveSxByteX86regPointerToX86reg(ValueReg, AddressReg, TempReg); } else { diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp index 18a89513f..8bf8034a7 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp +++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.cpp @@ -918,7 +918,7 @@ void CX86Ops::MoveConstToX86regPointer(x86Reg AddrReg1, x86Reg AddrReg2, uint32_ AddCode32(Const); } -void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg) +void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2) { uint8_t Param = 0; diff --git a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h index 976329ffa..cfed849b7 100644 --- a/Source/Project64-core/N64System/Recompiler/x86/x86ops.h +++ b/Source/Project64-core/N64System/Recompiler/x86/x86ops.h @@ -136,7 +136,7 @@ public: void MoveConstToX86Pointer(x86Reg X86Pointer, uint32_t Const); void MoveConstToX86reg(x86Reg Reg, uint32_t Const); void MoveConstToX86regPointer(x86Reg AddrReg1, x86Reg AddrReg2, uint32_t Const); - void MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg); + void MoveSxByteX86regPointerToX86reg(x86Reg Reg, x86Reg AddrReg1, x86Reg AddrReg2); void MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg Reg); void MoveSxVariableToX86regByte(void * Variable, const char * VariableName, x86Reg Reg); void MoveSxVariableToX86regHalf(void * Variable, const char * VariableName, x86Reg Reg);