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

Merge pull request #2488 from Tilka/cmp 

x64Emitter: drop duplicate enum & unused wrappers
This commit is contained in:
Lioncash 2015-05-31 03:24:17 -04:00
parent 43ed19a663 eb057d49a0
commit 4eef805270
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Common/x64Emitter.h
View File

@ -102,7 +102,7 @@ enum NormalOp {
nrmXCHG,
};
enum {
enum SSECompare {
CMP_EQ = 0,
CMP_LT = 1,
CMP_LE = 2,
@ -279,18 +279,6 @@ struct FixupBranch
int type; //0 = 8bit 1 = 32bit
};
enum SSECompare
{
EQ = 0,
LT,
LE,
UNORD,
NEQ,
NLT,
NLE,
ORD,
};
typedef const u8* JumpTarget;
class XEmitter
@ -567,14 +555,6 @@ public:
void CMPSS(X64Reg regOp, const OpArg& arg, u8 compare);
void CMPSD(X64Reg regOp, const OpArg& arg, u8 compare);
inline void CMPEQSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_EQ); }
inline void CMPLTSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_LT); }
inline void CMPLESS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_LE); }
inline void CMPUNORDSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_UNORD); }
inline void CMPNEQSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_NEQ); }
inline void CMPNLTSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_NLT); }
inline void CMPORDSS(X64Reg regOp, const OpArg& arg) { CMPSS(regOp, arg, CMP_ORD); }
// SSE/SSE2: Floating point packed arithmetic (x4 for float, x2 for double)
void ADDPS(X64Reg regOp, const OpArg& arg);
void ADDPD(X64Reg regOp, const OpArg& arg);

4
Source/Core/Core/PowerPC/Jit64/Jit_FloatingPoint.cpp
View File

@ -282,9 +282,9 @@ void Jit64::fselx(UGeckoInstruction inst)
// negative/positive zero and NaN properly.
// (a >= -0.0 ? c : b) transforms into (0 > a ? b : c), hence the NLE.
if (packed)
CMPPD(XMM0, fpr.R(a), NLE);
CMPPD(XMM0, fpr.R(a), CMP_NLE);
else
CMPSD(XMM0, fpr.R(a), NLE);
CMPSD(XMM0, fpr.R(a), CMP_NLE);
if (cpu_info.bSSE4_1)
{