From bd02d9e27f94faad6d8c08081e5dda55091f8e0f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 12 Mar 2021 14:03:40 -0500
Subject: [PATCH] thumb32: Implement STR immediate variants

---
 src/frontend/A32/decoder/thumb32.inc          |  8 +--
 .../impl/thumb32_store_single_data_item.cpp   | 51 +++++++++++++++++++
 .../A32/translate/impl/translate_thumb.h      |  4 ++
 3 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index 39214faa..53a148d4 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -134,10 +134,10 @@ INST(thumb32_STRH_imm_2,     "STRH (imm)",               "111110000010nnnntttt11
 INST(thumb32_STRH_imm_3,     "STRH (imm)",               "111110001010nnnnttttiiiiiiiiiiii")
 INST(thumb32_STRHT,          "STRHT",                    "111110000010nnnntttt1110iiiiiiii")
 INST(thumb32_STRH,           "STRH (reg)",               "111110000010nnnntttt000000iimmmm")
-//INST(thumb32_STR_imm_1,      "STR (imm)",                "111110000100--------1--1--------")
-//INST(thumb32_STR_imm_2,      "STR (imm)",                "111110000100--------1100--------")
-//INST(thumb32_STR_imm_3,      "STR (imm)",                "111110001100--------------------")
-//INST(thumb32_STRT,           "STRT",                     "111110000100--------1110--------")
+INST(thumb32_STR_imm_1,      "STR (imm)",                "111110000100nnnntttt1PU1iiiiiiii")
+INST(thumb32_STR_imm_2,      "STR (imm)",                "111110000100nnnntttt1100iiiiiiii")
+INST(thumb32_STR_imm_3,      "STR (imm)",                "111110001100nnnnttttiiiiiiiiiiii")
+INST(thumb32_STRT,           "STRT",                     "111110000100nnnntttt1110iiiiiiii")
 INST(thumb32_STR_reg,        "STR (reg)",                "111110000100nnnntttt000000iimmmm")
 
 // Load Byte and Memory Hints
diff --git a/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp b/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
index c9820d67..78c56fc6 100644
--- a/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_store_single_data_item.cpp
@@ -39,6 +39,10 @@ static void StoreImmHalfFn(ThumbTranslatorVisitor& v, const IR::U32& address, co
     v.ir.WriteMemory16(address, v.ir.LeastSignificantHalf(data));
 }
 
+static void StoreImmWordFn(ThumbTranslatorVisitor& v, const IR::U32& address, const IR::U32& data) {
+    v.ir.WriteMemory32(address, data);
+}
+
 static bool StoreImmediate(ThumbTranslatorVisitor& v, Reg n, Reg t, bool P, bool U, bool W, Imm<12> imm12,
                            StoreImmFn store_fn) {
     const auto imm32 = imm12.ZeroExtend();
@@ -164,6 +168,53 @@ bool ThumbTranslatorVisitor::thumb32_STRH(Reg n, Reg t, Imm<2> imm2, Reg m) {
     });
 }
 
+bool ThumbTranslatorVisitor::thumb32_STR_imm_1(Reg n, Reg t, bool P, bool U, Imm<8> imm8) {
+    if (n == Reg::PC) {
+        return UndefinedInstruction();
+    }
+    if (t == Reg::PC || n == t) {
+        return UnpredictableInstruction();
+    }
+    return StoreImmediate(*this, n, t, P, U, true, Imm<12>{imm8.ZeroExtend()}, StoreImmWordFn);
+}
+
+bool ThumbTranslatorVisitor::thumb32_STR_imm_2(Reg n, Reg t, Imm<8> imm8) {
+    if (n == Reg::PC) {
+        return UndefinedInstruction();
+    }
+    if (t == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+    return StoreImmediate(*this, n, t, true, false, false, Imm<12>{imm8.ZeroExtend()}, StoreImmWordFn);
+}
+
+bool ThumbTranslatorVisitor::thumb32_STR_imm_3(Reg n, Reg t, Imm<12> imm12) {
+    if (n == Reg::PC) {
+        return UndefinedInstruction();
+    }
+    if (t == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+    return StoreImmediate(*this, n, t, true, true, false, imm12, StoreImmWordFn);
+}
+
+bool ThumbTranslatorVisitor::thumb32_STRT(Reg n, Reg t, Imm<8> imm8) {
+    // TODO: Add an unpredictable instruction path if this
+    //       is executed in hypervisor mode if we ever support
+    //       privileged execution levels.
+
+    if (n == Reg::PC) {
+        return UndefinedInstruction();
+    }
+    if (t == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    // Treat this as a normal STR, given we don't support
+    // execution levels other than EL0 currently.
+    return StoreImmediate(*this, n, t, true, true, false, Imm<12>{imm8.ZeroExtend()}, StoreImmWordFn);
+}
+
 bool ThumbTranslatorVisitor::thumb32_STR_reg(Reg n, Reg t, Imm<2> imm2, Reg m) {
     return StoreRegister(*this, n, t, imm2, m, [this](const IR::U32& offset_address, const IR::U32& data) {
         ir.WriteMemory32(offset_address, data);
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index 70379209..723a552e 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -253,6 +253,10 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_STRH_imm_3(Reg n, Reg t, Imm<12> imm12);
     bool thumb32_STRHT(Reg n, Reg t, Imm<8> imm8);
     bool thumb32_STRH(Reg n, Reg t, Imm<2> imm2, Reg m);
+    bool thumb32_STR_imm_1(Reg n, Reg t, bool P, bool U, Imm<8> imm8);
+    bool thumb32_STR_imm_2(Reg n, Reg t, Imm<8> imm8);
+    bool thumb32_STR_imm_3(Reg n, Reg t, Imm<12> imm12);
+    bool thumb32_STRT(Reg n, Reg t, Imm<8> imm8);
     bool thumb32_STR_reg(Reg n, Reg t, Imm<2> imm2, Reg m);
 
     // thumb32 load byte and memory hints