From 984fc7fb39a6bba15921ff80662a8193097b4e76 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 11 Jan 2016 04:28:16 -0500
Subject: [PATCH] ARM Jit: Use std::tie for SlowmemHandler comparison
---
Source/Core/Core/PowerPC/JitArm64/Jit.h | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/Source/Core/Core/PowerPC/JitArm64/Jit.h b/Source/Core/Core/PowerPC/JitArm64/Jit.h
index 764f639004..7ad9464e05 100644
--- a/Source/Core/Core/PowerPC/JitArm64/Jit.h
+++ b/Source/Core/Core/PowerPC/JitArm64/Jit.h
@@ -5,6 +5,7 @@
#pragma once
#include <map>
+#include <tuple>
#include "Common/Arm64Emitter.h"
@@ -192,7 +193,6 @@ public:
void psq_st(UGeckoInstruction inst);
private:
-
struct SlowmemHandler
{
ARM64Reg dest_reg;
@@ -200,20 +200,11 @@ private:
BitSet32 gprs;
BitSet32 fprs;
u32 flags;
- bool operator< (const SlowmemHandler& rhs) const
- {
- if (dest_reg < rhs.dest_reg) return true;
- if (dest_reg > rhs.dest_reg) return false;
- 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;
+ bool operator<(const SlowmemHandler& rhs) const
+ {
+ return std::tie(dest_reg, addr_reg, gprs, fprs, flags) <
+ std::tie(rhs.dest_reg, rhs.addr_reg, rhs.gprs, rhs.fprs, rhs.flags);
}
};