From 5fc3cb2379d0bee096fc1ff776d9c94f02795be0 Mon Sep 17 00:00:00 2001
From: Tillmann Karras <tilkax@gmail.com>
Date: Sun, 6 Jun 2021 07:14:29 +0100
Subject: [PATCH] Interpreter: deduplicate integer comparisons

---
 .../Core/PowerPC/Interpreter/Interpreter.h    |  2 +
 .../Interpreter/Interpreter_Integer.cpp       | 74 ++++++-------------
 2 files changed, 24 insertions(+), 52 deletions(-)

diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
index a275948fe9..083abfc4cd 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter.h
@@ -291,6 +291,8 @@ private:
   // flag helper
   static void Helper_UpdateCR0(u32 value);
 
+  template <typename T>
+  static void Helper_IntCompare(UGeckoInstruction inst, T a, T b);
   static void Helper_FloatCompareOrdered(UGeckoInstruction inst, double a, double b);
   static void Helper_FloatCompareUnordered(UGeckoInstruction inst, double a, double b);
 
diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
index bd08ae5578..188f181a80 100644
--- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
+++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Integer.cpp
@@ -66,42 +66,36 @@ void Interpreter::andis_rc(UGeckoInstruction inst)
   Helper_UpdateCR0(rGPR[inst.RA]);
 }
 
+template <typename T>
+void Interpreter::Helper_IntCompare(UGeckoInstruction inst, T a, T b)
+{
+  u32 cr_field;
+
+  if (a < b)
+    cr_field = PowerPC::CR_LT;
+  else if (a > b)
+    cr_field = PowerPC::CR_GT;
+  else
+    cr_field = PowerPC::CR_EQ;
+
+  if (PowerPC::GetXER_SO())
+    cr_field |= PowerPC::CR_SO;
+
+  PowerPC::ppcState.cr.SetField(inst.CRFD, cr_field);
+}
+
 void Interpreter::cmpi(UGeckoInstruction inst)
 {
   const s32 a = static_cast<s32>(rGPR[inst.RA]);
   const s32 b = inst.SIMM_16;
-  u32 f;
-
-  if (a < b)
-    f = 0x8;
-  else if (a > b)
-    f = 0x4;
-  else
-    f = 0x2;  // equals
-
-  if (PowerPC::GetXER_SO())
-    f |= 0x1;
-
-  PowerPC::ppcState.cr.SetField(inst.CRFD, f);
+  Helper_IntCompare(inst, a, b);
 }
 
 void Interpreter::cmpli(UGeckoInstruction inst)
 {
   const u32 a = rGPR[inst.RA];
   const u32 b = inst.UIMM;
-  u32 f;
-
-  if (a < b)
-    f = 0x8;
-  else if (a > b)
-    f = 0x4;
-  else
-    f = 0x2;  // equals
-
-  if (PowerPC::GetXER_SO())
-    f |= 0x1;
-
-  PowerPC::ppcState.cr.SetField(inst.CRFD, f);
+  Helper_IntCompare(inst, a, b);
 }
 
 void Interpreter::mulli(UGeckoInstruction inst)
@@ -200,38 +194,14 @@ void Interpreter::cmp(UGeckoInstruction inst)
 {
   const s32 a = static_cast<s32>(rGPR[inst.RA]);
   const s32 b = static_cast<s32>(rGPR[inst.RB]);
-  u32 temp;
-
-  if (a < b)
-    temp = 0x8;
-  else if (a > b)
-    temp = 0x4;
-  else  // Equals
-    temp = 0x2;
-
-  if (PowerPC::GetXER_SO())
-    temp |= 0x1;
-
-  PowerPC::ppcState.cr.SetField(inst.CRFD, temp);
+  Helper_IntCompare(inst, a, b);
 }
 
 void Interpreter::cmpl(UGeckoInstruction inst)
 {
   const u32 a = rGPR[inst.RA];
   const u32 b = rGPR[inst.RB];
-  u32 temp;
-
-  if (a < b)
-    temp = 0x8;
-  else if (a > b)
-    temp = 0x4;
-  else  // Equals
-    temp = 0x2;
-
-  if (PowerPC::GetXER_SO())
-    temp |= 0x1;
-
-  PowerPC::ppcState.cr.SetField(inst.CRFD, temp);
+  Helper_IntCompare(inst, a, b);
 }
 
 void Interpreter::cntlzwx(UGeckoInstruction inst)