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

core: s/u32 pointer/uptr/

This commit is contained in:
Gregory Hainaut 2016-01-14 00:43:35 +01:00
parent 022cd9cd64
commit e23ba2340c
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/x86/iCore.cpp
View File

@ -963,7 +963,7 @@ void _freeXMMregs()
} }
} }
int _signExtendXMMtoM(u32 to, x86SSERegType from, int candestroy) int _signExtendXMMtoM(uptr to, x86SSERegType from, int candestroy)
{ {
int t0reg; int t0reg;
g_xmmtypes[from] = XMMT_INT; g_xmmtypes[from] = XMMT_INT;

6
pcsx2/x86/iCore.h
View File

@ -186,12 +186,12 @@ u8 _hasFreeXMMreg();
void _freeXMMregs(); void _freeXMMregs();
int _getNumXMMwrite(); int _getNumXMMwrite();
void _signExtendSFtoM(u32 mem); void _signExtendSFtoM(uptr mem);
// returns new index of reg, lower 32 bits already in mmx // 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 // 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 // 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 // // Instruction Info //
@ -311,7 +311,7 @@ u8 _hasFreeMMXreg();
void _freeMMXregs(); void _freeMMXregs();
int _getNumMMXwrite(); 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 _signExtendGPRMMXtoMMX(x86MMXRegType to, u32 gprreg, x86MMXRegType from, u32 gprfromreg);
int _allocCheckGPRtoMMX(EEINST* pinst, int reg, int mode); int _allocCheckGPRtoMMX(EEINST* pinst, int reg, int mode);

6
pcsx2/x86/iR3000A.cpp
View File

@ -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) ) if( PSX_IS_CONST1(fromgpr) )
xMOV(ptr32[(u32*)(to)], g_psxConstRegs[fromgpr] ); xMOV(ptr32[(u32*)(to)], g_psxConstRegs[fromgpr] );
@ -408,7 +409,9 @@ void _psxMoveGPRtoM(u32 to, int fromgpr)
xMOV(ptr[(void*)(to)], eax); xMOV(ptr[(void*)(to)], eax);
} }
} }
#endif
#if 0
void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr) void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr)
{ {
if( PSX_IS_CONST1(fromgpr) ) if( PSX_IS_CONST1(fromgpr) )
@ -419,6 +422,7 @@ void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr)
xMOV(ptr[xAddressReg(to)], eax); xMOV(ptr[xAddressReg(to)], eax);
} }
} }
#endif
void _psxFlushCall(int flushtype) void _psxFlushCall(int flushtype)
{ {

4
pcsx2/x86/iR3000A.h
View File

@ -49,8 +49,10 @@ void _psxFlushCall(int flushtype);
void _psxOnWriteReg(int reg); void _psxOnWriteReg(int reg);
void _psxMoveGPRtoR(const x86Emitter::xRegister32& to, int fromgpr); 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); void _psxMoveGPRtoRm(x86IntRegType to, int fromgpr);
#endif
extern u32 psxpc; // recompiler pc extern u32 psxpc; // recompiler pc
extern int psxbranch; // set for branch extern int psxbranch; // set for branch

2
pcsx2/x86/iR5900.h
View File

@ -105,7 +105,7 @@ u32* _eeGetConstReg(int reg);
// finds where the GPR is stored and moves lower 32 bits to EAX // finds where the GPR is stored and moves lower 32 bits to EAX
void _eeMoveGPRtoR(const x86Emitter::xRegister32& to, int fromgpr); 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 _eeMoveGPRtoRm(x86IntRegType to, int fromgpr);
void eeSignExtendTo(int gpr, bool onlyupper=false); void eeSignExtendTo(int gpr, bool onlyupper=false);

4
pcsx2/x86/ix86-32/iCore-32.cpp
View File

@ -872,7 +872,7 @@ void SetFPUstate() {
} }
} }
void _signExtendSFtoM(u32 mem) void _signExtendSFtoM(uptr mem)
{ {
xLAHF(); xLAHF();
xSAR(ax, 15); xSAR(ax, 15);
@ -880,7 +880,7 @@ void _signExtendSFtoM(u32 mem)
xMOV(ptr[(void*)(mem)], eax); xMOV(ptr[(void*)(mem)], eax);
} }
int _signExtendMtoMMX(x86MMXRegType to, u32 mem) int _signExtendMtoMMX(x86MMXRegType to, uptr mem)
{ {
int t0reg = _allocMMXreg(-1, MMX_TEMP, 0); int t0reg = _allocMMXreg(-1, MMX_TEMP, 0);

2
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -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) ) if( GPR_IS_CONST1(fromgpr) )
xMOV(ptr32[(u32*)(to)], g_cpuConstRegs[fromgpr].UL[0] ); xMOV(ptr32[(u32*)(to)], g_cpuConstRegs[fromgpr].UL[0] );