From c18b20b8d18ccb2d69ed715126d04e1928fecca7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 15 Apr 2018 05:22:50 -0400
Subject: [PATCH] A64: Implement CMGE (register, scalar)

---
 src/frontend/A64/decoder/a64.inc              |  2 +-
 .../translate/impl/simd_scalar_three_same.cpp | 49 ++++++++++++++-----
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/frontend/A64/decoder/a64.inc b/src/frontend/A64/decoder/a64.inc
index 2c40ecba..8c0e0bf9 100644
--- a/src/frontend/A64/decoder/a64.inc
+++ b/src/frontend/A64/decoder/a64.inc
@@ -446,7 +446,7 @@ INST(ADDP_pair,              "ADDP (scalar)",                             "01011
 //INST(SQADD_1,                "SQADD",                                     "01011110zz1mmmmm000011nnnnnddddd")
 //INST(SQSUB_1,                "SQSUB",                                     "01011110zz1mmmmm001011nnnnnddddd")
 INST(CMGT_reg_1,             "CMGT (register)",                           "01011110zz1mmmmm001101nnnnnddddd")
-//INST(CMGE_reg_1,             "CMGE (register)",                           "01011110zz1mmmmm001111nnnnnddddd")
+INST(CMGE_reg_1,             "CMGE (register)",                           "01011110zz1mmmmm001111nnnnnddddd")
 //INST(SSHL_1,                 "SSHL",                                      "01011110zz1mmmmm010001nnnnnddddd")
 //INST(SQSHL_reg_1,            "SQSHL (register)",                          "01011110zz1mmmmm010011nnnnnddddd")
 //INST(SRSHL_1,                "SRSHL",                                     "01011110zz1mmmmm010101nnnnnddddd")
diff --git a/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp b/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp
index 1e602a5e..f38d788c 100644
--- a/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp
+++ b/src/frontend/A64/translate/impl/simd_scalar_three_same.cpp
@@ -8,6 +8,37 @@
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
+namespace {
+enum class ComparisonType {
+    GE,
+    GT,
+};
+
+bool ScalarCompare(TranslatorVisitor& v, Imm<2> size, Vec Vm, Vec Vn, Vec Vd, ComparisonType type) {
+    if (size != 0b11) {
+        return v.ReservedValue();
+    }
+
+    const size_t esize = 64;
+    const size_t datasize = 64;
+
+    const IR::U128 operand1 = v.V(datasize, Vn);
+    const IR::U128 operand2 = v.V(datasize, Vm);
+
+    const IR::U128 result = [&] {
+        switch (type) {
+        case ComparisonType::GE:
+            return v.ir.VectorGreaterEqualSigned(esize, operand1, operand2);
+        case ComparisonType::GT:
+        default:
+            return v.ir.VectorGreaterSigned(esize, operand1, operand2);
+        }
+    }();
+
+    v.V_scalar(datasize, Vd, v.ir.VectorGetElement(esize, result, 0));
+    return true;
+}
+} // Anonymous namespace
 
 bool TranslatorVisitor::ADD_1(Imm<2> size, Vec Vm, Vec Vn, Vec Vd) {
     if (size != 0b11) {
@@ -23,20 +54,12 @@ bool TranslatorVisitor::ADD_1(Imm<2> size, Vec Vm, Vec Vn, Vec Vd) {
     return true;
 }
 
+bool TranslatorVisitor::CMGE_reg_1(Imm<2> size, Vec Vm, Vec Vn, Vec Vd) {
+    return ScalarCompare(*this, size, Vm, Vn, Vd, ComparisonType::GE);
+}
+
 bool TranslatorVisitor::CMGT_reg_1(Imm<2> size, Vec Vm, Vec Vn, Vec Vd) {
-    if (size != 0b11) {
-        return ReservedValue();
-    }
-
-    const size_t esize = 8 << size.ZeroExtend();
-    const size_t datasize = 128;
-
-    const IR::U128 operand1 = V(datasize, Vn);
-    const IR::U128 operand2 = V(datasize, Vm);
-    const IR::U128 result = ir.VectorGreaterSigned(esize, operand1, operand2);
-
-    V_scalar(esize, Vd, ir.VectorGetElement(esize, result, 0));
-    return true;
+    return ScalarCompare(*this, size, Vm, Vn, Vd, ComparisonType::GT);
 }
 
 bool TranslatorVisitor::SUB_1(Imm<2> size, Vec Vm, Vec Vn, Vec Vd) {