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

ARM Jit: Use std::tie for SlowmemHandler comparison

This commit is contained in:
Lioncash 2016-01-11 04:28:16 -05:00
parent ff0e1c3624
commit 984fc7fb39
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/PowerPC/JitArm64/Jit.h
View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <map> #include <map>
#include <tuple>
#include "Common/Arm64Emitter.h" #include "Common/Arm64Emitter.h"
@ -192,7 +193,6 @@ public:
void psq_st(UGeckoInstruction inst); void psq_st(UGeckoInstruction inst);
private: private:
struct SlowmemHandler struct SlowmemHandler
{ {
ARM64Reg dest_reg; ARM64Reg dest_reg;
@ -200,20 +200,11 @@ private:
BitSet32 gprs; BitSet32 gprs;
BitSet32 fprs; BitSet32 fprs;
u32 flags; u32 flags;
bool operator<(const SlowmemHandler& rhs) const bool operator<(const SlowmemHandler& rhs) const
{ {
if (dest_reg < rhs.dest_reg) return true; return std::tie(dest_reg, addr_reg, gprs, fprs, flags) <
if (dest_reg > rhs.dest_reg) return false; std::tie(rhs.dest_reg, rhs.addr_reg, rhs.gprs, rhs.fprs, rhs.flags);
if (addr_reg < rhs.addr_reg) return true;
if (addr_reg > rhs.addr_reg) return false;
if (gprs < rhs.gprs) return true;
if (gprs > rhs.gprs) return false;
if (fprs < rhs.fprs) return true;
if (fprs > rhs.fprs) return false;
if (flags < rhs.flags) return true;
if (flags > rhs.flags) return false;
return false;
} }
}; };