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

x86emitter: Remove deprecated codegen functions 

Successfully moved off of all of them
This commit is contained in:
Tellow Krinkle 2020-06-29 15:10:42 -05:00 committed by tellowkrinkle
parent 0711e0cd52
commit cd813edb1b
5 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/include/x86emitter/implement/jmpcall.h
View File

@ -29,10 +29,6 @@ struct xImpl_JmpCall
void operator()(const xAddressReg &absreg) const;
void operator()(const xIndirectNative &src) const;
#ifdef __M_X86_64
[[deprecated]] // Should move to xIndirectNative
void operator()(const xIndirect32 &absreg) const;
#endif
// Special form for calling functions. This form automatically resolves the
// correct displacement based on the size of the instruction being generated.
@ -71,9 +67,7 @@ struct xImpl_FastCall
#ifdef __M_X86_64
void operator()(void *f, const xRegisterLong &a1, const xRegisterLong &a2 = xEmptyReg) const;
void operator()(void *f, u32 a1, const xRegisterLong &a2) const;
[[deprecated]] // Switch to xIndirect32, as the size of this isn't obvious
#endif
void operator()(void *f, const xIndirectVoid &a1) const;
template <typename T>
__fi void operator()(T *func, u32 a1, const xRegisterLong &a2 = xEmptyReg) const
@ -93,11 +87,6 @@ struct xImpl_FastCall
(*this)((void*)func, a1, a2);
}
#ifdef __M_X86_64
[[deprecated]] // Switch to xIndirectNative
void operator()(const xIndirect32 &f, const xRegisterLong &a1 = xEmptyReg, const xRegisterLong &a2 = xEmptyReg) const;
#endif
void operator()(const xIndirectNative &f, const xRegisterLong &a1 = xEmptyReg, const xRegisterLong &a2 = xEmptyReg) const;
};

6
common/include/x86emitter/instructions.h
View File

@ -89,13 +89,7 @@ extern const xImpl_Group8 xBTC;
extern const xImpl_BitScan xBSF, xBSR;
extern const xImpl_JmpCall xJMP;
#ifdef __M_X86_64
// 32 bits Call won't be compatible in 64 bits (different ABI)
// Just a reminder to port the code
[[deprecated]] extern const xImpl_JmpCall xCALL;
#else
extern const xImpl_JmpCall xCALL;
#endif
extern const xImpl_FastCall xFastCall;
// ------------------------------------------------------------------------

17
common/src/x86emitter/jmp.cpp
View File

@ -44,11 +44,6 @@ void xImpl_JmpCall::operator()(const xIndirectNative &src) const {
xWrite8(0xff);
EmitSibMagic(isJmp ? 4 : 2, src);
}
#ifdef __M_X86_64
void xImpl_JmpCall::operator()(const xIndirect32 &absreg) const {
xOpWrite(0, 0xff, isJmp ? 4 : 2, absreg);
}
#endif
const xImpl_JmpCall xJMP = {true};
const xImpl_JmpCall xCALL = {false};
@ -120,24 +115,12 @@ void xImpl_FastCall::operator()(void *f, const xIndirect32 &a1) const {
(*this)(f, arg1regd);
}
void xImpl_FastCall::operator()(void *f, const xIndirectVoid &a1) const {
xMOV(arg1regd, a1);
(*this)(f, arg1regd);
}
void xImpl_FastCall::operator()(void *f, u32 a1, u32 a2) const {
xMOV(arg1regd, a1);
xMOV(arg2regd, a2);
(*this)(f, arg1regd, arg2regd);
}
#ifdef __M_X86_64
void xImpl_FastCall::operator()(const xIndirect32 &f, const xRegisterLong &a1, const xRegisterLong &a2) const {
prepareRegsForFastcall(a1, a2);
xCALL(f);
}
#endif
void xImpl_FastCall::operator()(const xIndirectNative &f, const xRegisterLong &a1, const xRegisterLong &a2) const {
prepareRegsForFastcall(a1, a2);
xCALL(f);

3
pcsx2/x86/iCore.h
View File

@ -118,10 +118,7 @@ extern _x86regs x86regs[iREGCNT_GPR], s_saveX86regs[iREGCNT_GPR];
uptr _x86GetAddr(int type, int reg);
void _initX86regs();
int _getFreeX86reg(int mode);
[[deprecated]] int _allocX86reg(x86Emitter::xRegister64 x86reg, int type, int reg, int mode);
int _allocX86reg(x86Emitter::xRegister32 x86reg, int type, int reg, int mode);
// To resolve ambiguity between 32 and 64, delete once everything's on 32
int _allocX86reg(x86Emitter::xRegisterEmpty x86reg, int type, int reg, int mode);
void _deleteX86reg(int type, int reg, int flush);
int _checkX86reg(int type, int reg, int mode);
void _addNeededX86reg(int type, int reg);

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

@ -239,16 +239,6 @@ void _flushConstRegs()
}
}
int _allocX86reg(xRegisterEmpty x86reg, int type, int reg, int mode)
{
return _allocX86reg(xRegister32(x86reg), type, reg, mode);
}
int _allocX86reg(xRegister64 x86reg, int type, int reg, int mode)
{
return _allocX86reg(xRegister32(x86reg.Id), type, reg, mode);
}
int _allocX86reg(xRegister32 x86reg, int type, int reg, int mode)
{
uint i;