diff --git a/pcsx2/x86/iCore.cpp b/pcsx2/x86/iCore.cpp index d4f5414019..f4102808dc 100644 --- a/pcsx2/x86/iCore.cpp +++ b/pcsx2/x86/iCore.cpp @@ -963,7 +963,7 @@ void _freeXMMregs() } } -int _signExtendXMMtoM(u32 to, x86SSERegType from, int candestroy) +int _signExtendXMMtoM(uptr to, x86SSERegType from, int candestroy) { int t0reg; g_xmmtypes[from] = XMMT_INT; diff --git a/pcsx2/x86/iCore.h b/pcsx2/x86/iCore.h index 12b663ae86..a3575423c7 100644 --- a/pcsx2/x86/iCore.h +++ b/pcsx2/x86/iCore.h @@ -186,12 +186,12 @@ u8 _hasFreeXMMreg(); void _freeXMMregs(); int _getNumXMMwrite(); -void _signExtendSFtoM(u32 mem); +void _signExtendSFtoM(uptr mem); // returns new index of reg, lower 32 bits already in mmx // shift is used when the data is in the top bits of the mmx reg to begin with // a negative shift is for sign extension -int _signExtendXMMtoM(u32 to, x86SSERegType from, int candestroy); // returns true if reg destroyed +int _signExtendXMMtoM(uptr to, x86SSERegType from, int candestroy); // returns true if reg destroyed ////////////////////// // Instruction Info // @@ -311,7 +311,7 @@ u8 _hasFreeMMXreg(); void _freeMMXregs(); int _getNumMMXwrite(); -int _signExtendMtoMMX(x86MMXRegType to, u32 mem); +int _signExtendMtoMMX(x86MMXRegType to, uptr mem); int _signExtendGPRMMXtoMMX(x86MMXRegType to, u32 gprreg, x86MMXRegType from, u32 gprfromreg); int _allocCheckGPRtoMMX(EEINST* pinst, int reg, int mode); diff --git a/pcsx2/x86/iR3000A.cpp b/pcsx2/x86/iR3000A.cpp index de1f88b377..2ba5e2f1cf 100644 --- a/pcsx2/x86/iR3000A.cpp +++ b/pcsx2/x86/iR3000A.cpp @@ -398,7 +398,8 @@ void _psxMoveGPRtoR(const xRegister32& to, int fromgpr) } } -void _psxMoveGPRtoM(u32 to, int fromgpr) +#if 0 +void _psxMoveGPRtoM(uptr to, int fromgpr) { if( PSX_IS_CONST1(fromgpr) ) xMOV(ptr32[(u32*)(to)], g_psxConstRegs[fromgpr] ); @@ -408,7 +409,9 @@ void _psxMoveGPRtoM(u32 to, int fromgpr) xMOV(ptr[(void*)(to)], eax); } } +#endif +#if 0 void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr) { if( PSX_IS_CONST1(fromgpr) ) @@ -419,6 +422,7 @@ void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr) xMOV(ptr[xAddressReg(to)], eax); } } +#endif void _psxFlushCall(int flushtype) { diff --git a/pcsx2/x86/iR3000A.h b/pcsx2/x86/iR3000A.h index d880cd78b8..d85391f4c5 100644 --- a/pcsx2/x86/iR3000A.h +++ b/pcsx2/x86/iR3000A.h @@ -49,8 +49,10 @@ void _psxFlushCall(int flushtype); void _psxOnWriteReg(int reg); void _psxMoveGPRtoR(const x86Emitter::xRegister32& to, int fromgpr); -void _psxMoveGPRtoM(u32 to, int fromgpr); +#if 0 +void _psxMoveGPRtoM(uptr to, int fromgpr); void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr); +#endif extern u32 psxpc; // recompiler pc extern int psxbranch; // set for branch diff --git a/pcsx2/x86/iR5900.h b/pcsx2/x86/iR5900.h index 28ef0fa136..bb5c6ed937 100644 --- a/pcsx2/x86/iR5900.h +++ b/pcsx2/x86/iR5900.h @@ -105,7 +105,7 @@ u32* _eeGetConstReg(int reg); // finds where the GPR is stored and moves lower 32 bits to EAX void _eeMoveGPRtoR(const x86Emitter::xRegister32& to, int fromgpr); -void _eeMoveGPRtoM(u32 to, int fromgpr); +void _eeMoveGPRtoM(uptr to, int fromgpr); void _eeMoveGPRtoRm(x86IntRegType to, int fromgpr); void eeSignExtendTo(int gpr, bool onlyupper=false); diff --git a/pcsx2/x86/ix86-32/iCore-32.cpp b/pcsx2/x86/ix86-32/iCore-32.cpp index d41c57aab0..5711ba8b4f 100644 --- a/pcsx2/x86/ix86-32/iCore-32.cpp +++ b/pcsx2/x86/ix86-32/iCore-32.cpp @@ -872,7 +872,7 @@ void SetFPUstate() { } } -void _signExtendSFtoM(u32 mem) +void _signExtendSFtoM(uptr mem) { xLAHF(); xSAR(ax, 15); @@ -880,7 +880,7 @@ void _signExtendSFtoM(u32 mem) xMOV(ptr[(void*)(mem)], eax); } -int _signExtendMtoMMX(x86MMXRegType to, u32 mem) +int _signExtendMtoMMX(x86MMXRegType to, uptr mem) { int t0reg = _allocMMXreg(-1, MMX_TEMP, 0); diff --git a/pcsx2/x86/ix86-32/iR5900-32.cpp b/pcsx2/x86/ix86-32/iR5900-32.cpp index 8cb340c409..402c795d68 100644 --- a/pcsx2/x86/ix86-32/iR5900-32.cpp +++ b/pcsx2/x86/ix86-32/iR5900-32.cpp @@ -176,7 +176,7 @@ void _eeMoveGPRtoR(const xRegister32& to, int fromgpr) } } -void _eeMoveGPRtoM(u32 to, int fromgpr) +void _eeMoveGPRtoM(uptr to, int fromgpr) { if( GPR_IS_CONST1(fromgpr) ) xMOV(ptr32[(u32*)(to)], g_cpuConstRegs[fromgpr].UL[0] );