diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index 21ebdbda60..2533738ade 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -539,13 +539,13 @@ void _psxDeleteReg(int reg, int flush) _deleteX86reg(X86TYPE_PSX, reg, flush ? 0 : 2); } -void _psxMoveGPRtoR(x86IntRegType to, int fromgpr) +void _psxMoveGPRtoR(const xRegister32& to, int fromgpr) { if( PSX_IS_CONST1(fromgpr) ) - xMOV(xRegister32(to), g_psxConstRegs[fromgpr] ); + xMOV(to, g_psxConstRegs[fromgpr] ); else { // check x86 - xMOV(xRegister32(to), ptr[&psxRegs.GPR.r[ fromgpr ] ]); + xMOV(to, ptr[&psxRegs.GPR.r[ fromgpr ] ]); } } @@ -980,7 +980,7 @@ void psxSetBranchReg(u32 reg) if( reg != 0xffffffff ) { _allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE); - _psxMoveGPRtoR(ESI, reg); + _psxMoveGPRtoR(esi, reg); psxRecompileNextInstruction(1); diff --git a/pcsx2/x86/iR3000A.h b/pcsx2/x86/iR3000A.h index df7e985428..d880cd78b8 100644 --- a/pcsx2/x86/iR3000A.h +++ b/pcsx2/x86/iR3000A.h @@ -48,7 +48,7 @@ void _psxFlushCall(int flushtype); void _psxOnWriteReg(int reg); -void _psxMoveGPRtoR(x86IntRegType to, int fromgpr); +void _psxMoveGPRtoR(const x86Emitter::xRegister32& to, int fromgpr); void _psxMoveGPRtoM(u32 to, int fromgpr); void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr); diff --git a/pcsx2/x86/iR3000Atables.cpp b/pcsx2/x86/iR3000Atables.cpp index 92b0dae163..b5a1d14e3e 100644 --- a/pcsx2/x86/iR3000Atables.cpp +++ b/pcsx2/x86/iR3000Atables.cpp @@ -949,7 +949,7 @@ void rpsxJALR() { // jalr Rs _allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE); - _psxMoveGPRtoR(ESI, _Rs_); + _psxMoveGPRtoR(esi, _Rs_); if ( _Rd_ ) {