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

ee: use xRegister32 for 1st argument of _psxMoveGPRtoR

This commit is contained in:
Gregory Hainaut 2015-11-26 21:54:18 +01:00
parent 3570467838
commit 4ddc4778e4
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2/x86/iR3000A.cpp
View File

@ -539,13 +539,13 @@ void _psxDeleteReg(int reg, int flush)
_deleteX86reg(X86TYPE_PSX, reg, flush ? 0 : 2); _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) ) if( PSX_IS_CONST1(fromgpr) )
xMOV(xRegister32(to), g_psxConstRegs[fromgpr] ); xMOV(to, g_psxConstRegs[fromgpr] );
else { else {
// check x86 // 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 ) { if( reg != 0xffffffff ) {
_allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE); _allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE);
_psxMoveGPRtoR(ESI, reg); _psxMoveGPRtoR(esi, reg);
psxRecompileNextInstruction(1); psxRecompileNextInstruction(1);

2
pcsx2/x86/iR3000A.h
View File

@ -48,7 +48,7 @@ void _psxFlushCall(int flushtype);
void _psxOnWriteReg(int reg); 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 _psxMoveGPRtoM(u32 to, int fromgpr);
void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr); void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr);

2
pcsx2/x86/iR3000Atables.cpp
View File

@ -949,7 +949,7 @@ void rpsxJALR()
{ {
// jalr Rs // jalr Rs
_allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE); _allocX86reg(ESI, X86TYPE_PCWRITEBACK, 0, MODE_WRITE);
_psxMoveGPRtoR(ESI, _Rs_); _psxMoveGPRtoR(esi, _Rs_);
if ( _Rd_ ) if ( _Rd_ )
{ {