From 273125e0b1f8ea8c2fad3830126d4b7f69b4826b Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 15:52:41 -0500
Subject: [PATCH 01/12] thumb32: Implement SXTH

---
 src/CMakeLists.txt                                     |  1 +
 .../impl/thumb32_data_processing_register.cpp          | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c99dec73..7a12f2e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,6 +154,7 @@ if ("A32" IN_LIST DYNARMIC_FRONTENDS)
         frontend/A32/translate/impl/synchronization.cpp
         frontend/A32/translate/impl/thumb16.cpp
         frontend/A32/translate/impl/thumb32.cpp
+        frontend/A32/translate/impl/thumb32_data_processing_register.cpp
         frontend/A32/translate/impl/thumb32_long_multiply.cpp
         frontend/A32/translate/impl/thumb32_misc.cpp
         frontend/A32/translate/impl/thumb32_multiply.cpp
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
new file mode 100644
index 00000000..b8234f37
--- /dev/null
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -0,0 +1,10 @@
+/* This file is part of the dynarmic project.
+ * Copyright (c) 2021 MerryMage
+ * SPDX-License-Identifier: 0BSD
+ */
+
+#include "frontend/A32/translate/impl/translate_thumb.h"
+
+namespace Dynarmic::A32 {
+
+} // namespace Dynarmic::A32

From c0871d4c18c0720082f8bd099fac46b6cfa25a0a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:04:33 -0500
Subject: [PATCH 02/12] thumb32: Implement SXTAH

---
 src/frontend/A32/decoder/thumb32.inc          |  4 +--
 .../impl/thumb32_data_processing_register.cpp | 29 +++++++++++++++++++
 .../A32/translate/impl/translate_thumb.h      |  4 +++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index d5c26c6d..12e0e4e2 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -195,8 +195,8 @@
 //INST(thumb32_LSR_reg,        "LSR (reg)",                "11111010001-----1111----0000----")
 //INST(thumb32_ASR_reg,        "ASR (reg)",                "11111010010-----1111----0000----")
 //INST(thumb32_ROR_reg,        "ROR (reg)",                "11111010011-----1111----0000----")
-//INST(thumb32_SXTH,           "SXTH",                     "11111010000011111111----1-------")
-//INST(thumb32_SXTAH,          "SXTAH",                    "111110100000----1111----1-------")
+INST(thumb32_SXTH,           "SXTH",                     "11111010000011111111dddd10rrmmmm")
+INST(thumb32_SXTAH,          "SXTAH",                    "111110100000nnnn1111dddd10rrmmmm")
 //INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111----1-------")
 //INST(thumb32_UXTAH,          "UXTAH",                    "111110100001----1111----1-------")
 //INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index b8234f37..7d2e9252 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -6,5 +6,34 @@
 #include "frontend/A32/translate/impl/translate_thumb.h"
 
 namespace Dynarmic::A32 {
+static IR::U32 Rotate(A32::IREmitter& ir, Reg m, SignExtendRotation rotate) {
+    const u8 rotate_by = static_cast<u8>(static_cast<size_t>(rotate) * 8);
+    return ir.RotateRight(ir.GetRegister(m), ir.Imm8(rotate_by), ir.Imm1(0)).result;
+}
+
+bool ThumbTranslatorVisitor::thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto result = ir.SignExtendHalfToWord(ir.LeastSignificantHalf(rotated));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
+bool ThumbTranslatorVisitor::thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto reg_n = ir.GetRegister(n);
+    const auto result = ir.Add(reg_n, ir.SignExtendHalfToWord(ir.LeastSignificantHalf(rotated)));
+
+    ir.SetRegister(d, result);
+    return true;
+}
 
 } // namespace Dynarmic::A32
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index 98558a50..bbd238eb 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -121,6 +121,10 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_BLX_imm(Imm<11> hi, Imm<11> lo);
     bool thumb32_UDF();
 
+    // thumb32 data processing (register) instructions
+    bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
+
     // thumb32 long multiply, long multiply accumulate, and divide instructions
     bool thumb32_SDIV(Reg n, Reg d, Reg m);
     bool thumb32_SMLAL(Reg n, Reg dLo, Reg dHi, Reg m);

From e12ee8d4d78632294af621a10acda12ff5a0ad4a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:07:17 -0500
Subject: [PATCH 03/12] thumb32: Implement UXTH

---
 src/frontend/A32/decoder/thumb32.inc                 |  2 +-
 .../impl/thumb32_data_processing_register.cpp        | 12 ++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index 12e0e4e2..da51e73e 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -197,7 +197,7 @@
 //INST(thumb32_ROR_reg,        "ROR (reg)",                "11111010011-----1111----0000----")
 INST(thumb32_SXTH,           "SXTH",                     "11111010000011111111dddd10rrmmmm")
 INST(thumb32_SXTAH,          "SXTAH",                    "111110100000nnnn1111dddd10rrmmmm")
-//INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111----1-------")
+INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111dddd10rrmmmm")
 //INST(thumb32_UXTAH,          "UXTAH",                    "111110100001----1111----1-------")
 //INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111----1-------")
 //INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010----1111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 7d2e9252..fe61f1b3 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -36,4 +36,16 @@ bool ThumbTranslatorVisitor::thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rota
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto result = ir.ZeroExtendHalfToWord(ir.LeastSignificantHalf(rotated));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 } // namespace Dynarmic::A32
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index bbd238eb..d1571ecf 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -124,6 +124,7 @@ struct ThumbTranslatorVisitor final {
     // thumb32 data processing (register) instructions
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);
 
     // thumb32 long multiply, long multiply accumulate, and divide instructions
     bool thumb32_SDIV(Reg n, Reg d, Reg m);

From 39a75472e248d56675fdd89d906d8643d8d0ce31 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:09:37 -0500
Subject: [PATCH 04/12] thumb32: Implement UXTAH

---
 src/frontend/A32/decoder/thumb32.inc                |  2 +-
 .../impl/thumb32_data_processing_register.cpp       | 13 +++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index da51e73e..dc0dc136 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -198,7 +198,7 @@
 INST(thumb32_SXTH,           "SXTH",                     "11111010000011111111dddd10rrmmmm")
 INST(thumb32_SXTAH,          "SXTAH",                    "111110100000nnnn1111dddd10rrmmmm")
 INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111dddd10rrmmmm")
-//INST(thumb32_UXTAH,          "UXTAH",                    "111110100001----1111----1-------")
+INST(thumb32_UXTAH,          "UXTAH",                    "111110100001nnnn1111dddd10rrmmmm")
 //INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111----1-------")
 //INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010----1111----1-------")
 //INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index fe61f1b3..2ca195c7 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -48,4 +48,17 @@ bool ThumbTranslatorVisitor::thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto reg_n = ir.GetRegister(n);
+    const auto result = ir.Add(reg_n, ir.ZeroExtendHalfToWord(ir.LeastSignificantHalf(rotated)));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 } // namespace Dynarmic::A32
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index d1571ecf..33792a82 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -125,6 +125,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
 
     // thumb32 long multiply, long multiply accumulate, and divide instructions
     bool thumb32_SDIV(Reg n, Reg d, Reg m);

From 1b5fcfd8d178789759644e3f2b4fb48fb0d2455f Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:11:09 -0500
Subject: [PATCH 05/12] thumb32: Implement SXTB16

---
 src/frontend/A32/decoder/thumb32.inc               |  2 +-
 .../impl/thumb32_data_processing_register.cpp      | 14 ++++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h  |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index dc0dc136..acee99a4 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -199,7 +199,7 @@ INST(thumb32_SXTH,           "SXTH",                     "11111010000011111111dd
 INST(thumb32_SXTAH,          "SXTAH",                    "111110100000nnnn1111dddd10rrmmmm")
 INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111dddd10rrmmmm")
 INST(thumb32_UXTAH,          "UXTAH",                    "111110100001nnnn1111dddd10rrmmmm")
-//INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111----1-------")
+INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111dddd10rrmmmm")
 //INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010----1111----1-------")
 //INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111----1-------")
 //INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011----1111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 2ca195c7..0c5715fe 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -11,6 +11,20 @@ static IR::U32 Rotate(A32::IREmitter& ir, Reg m, SignExtendRotation rotate) {
     return ir.RotateRight(ir.GetRegister(m), ir.Imm8(rotate_by), ir.Imm1(0)).result;
 }
 
+bool ThumbTranslatorVisitor::thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto low_byte = ir.And(rotated, ir.Imm32(0x00FF00FF));
+    const auto sign_bit = ir.And(rotated, ir.Imm32(0x00800080));
+    const auto result = ir.Or(low_byte, ir.Mul(sign_bit, ir.Imm32(0x1FE)));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index 33792a82..af2bf46d 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -122,6 +122,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_UDF();
 
     // thumb32 data processing (register) instructions
+    bool thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);

From 6733cdd706035cbc2ab21d99becce928a539970a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:13:34 -0500
Subject: [PATCH 06/12] thumb32: Implement SXTAB16

---
 src/frontend/A32/decoder/thumb32.inc              |  2 +-
 .../impl/thumb32_data_processing_register.cpp     | 15 +++++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index acee99a4..5dfc7df9 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -200,7 +200,7 @@ INST(thumb32_SXTAH,          "SXTAH",                    "111110100000nnnn1111dd
 INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111dddd10rrmmmm")
 INST(thumb32_UXTAH,          "UXTAH",                    "111110100001nnnn1111dddd10rrmmmm")
 INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111dddd10rrmmmm")
-//INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010----1111----1-------")
+INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010nnnn1111dddd10rrmmmm")
 //INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111----1-------")
 //INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011----1111----1-------")
 //INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 0c5715fe..0a76a8ce 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -25,6 +25,21 @@ bool ThumbTranslatorVisitor::thumb32_SXTB16(Reg d, SignExtendRotation rotate, Re
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto low_byte = ir.And(rotated, ir.Imm32(0x00FF00FF));
+    const auto sign_bit = ir.And(rotated, ir.Imm32(0x00800080));
+    const auto addend = ir.Or(low_byte, ir.Mul(sign_bit, ir.Imm32(0x1FE)));
+    const auto result = ir.PackedAddU16(addend, ir.GetRegister(n)).result;
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index af2bf46d..c4503b43 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -123,6 +123,7 @@ struct ThumbTranslatorVisitor final {
 
     // thumb32 data processing (register) instructions
     bool thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);

From eec16eea457ffd703b8f99fc7359943c994fd4c3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:15:28 -0500
Subject: [PATCH 07/12] thumb32: Implement UXTB16

---
 src/frontend/A32/decoder/thumb32.inc                 |  2 +-
 .../impl/thumb32_data_processing_register.cpp        | 12 ++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index 5dfc7df9..dbc92aaa 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -201,7 +201,7 @@ INST(thumb32_UXTH,           "UXTH",                     "11111010000111111111dd
 INST(thumb32_UXTAH,          "UXTAH",                    "111110100001nnnn1111dddd10rrmmmm")
 INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111dddd10rrmmmm")
 INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010nnnn1111dddd10rrmmmm")
-//INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111----1-------")
+INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111dddd10rrmmmm")
 //INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011----1111----1-------")
 //INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111----1-------")
 //INST(thumb32_SXTAB,          "SXTAB",                    "111110100100----1111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 0a76a8ce..48478ad9 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -65,6 +65,18 @@ bool ThumbTranslatorVisitor::thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rota
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto result = ir.And(rotated, ir.Imm32(0x00FF00FF));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index c4503b43..ce205f98 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -126,6 +126,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
 

From 3cefdc3ab9a7785a336cb8ef1b6955bf9370babf Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:16:34 -0500
Subject: [PATCH 08/12] thumb32: Implement UXTAB16

---
 src/frontend/A32/decoder/thumb32.inc               |  2 +-
 .../impl/thumb32_data_processing_register.cpp      | 14 ++++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h  |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index dbc92aaa..fb17c5e3 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -202,7 +202,7 @@ INST(thumb32_UXTAH,          "UXTAH",                    "111110100001nnnn1111dd
 INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111dddd10rrmmmm")
 INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010nnnn1111dddd10rrmmmm")
 INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111dddd10rrmmmm")
-//INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011----1111----1-------")
+INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011nnnn1111dddd10rrmmmm")
 //INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111----1-------")
 //INST(thumb32_SXTAB,          "SXTAB",                    "111110100100----1111----1-------")
 //INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 48478ad9..bfab403b 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -77,6 +77,20 @@ bool ThumbTranslatorVisitor::thumb32_UXTB16(Reg d, SignExtendRotation rotate, Re
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    auto result = ir.And(rotated, ir.Imm32(0x00FF00FF));
+    const auto reg_n = ir.GetRegister(n);
+    result = ir.PackedAddU16(reg_n, result).result;
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index ce205f98..6ac684d8 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -127,6 +127,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
 

From 75a28b00a729542350a4246d1ced6421be861a15 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:18:26 -0500
Subject: [PATCH 09/12] thumb32: Implement SXTB

---
 src/frontend/A32/decoder/thumb32.inc                 |  2 +-
 .../impl/thumb32_data_processing_register.cpp        | 12 ++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index fb17c5e3..9da07c30 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -203,7 +203,7 @@ INST(thumb32_SXTB16,         "SXTB16",                   "11111010001011111111dd
 INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010nnnn1111dddd10rrmmmm")
 INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111dddd10rrmmmm")
 INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011nnnn1111dddd10rrmmmm")
-//INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111----1-------")
+INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111dddd10rrmmmm")
 //INST(thumb32_SXTAB,          "SXTAB",                    "111110100100----1111----1-------")
 //INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111----1-------")
 //INST(thumb32_UXTAB,          "UXTAB",                    "111110100101----1111----1-------")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index bfab403b..e8c4358f 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -11,6 +11,18 @@ static IR::U32 Rotate(A32::IREmitter& ir, Reg m, SignExtendRotation rotate) {
     return ir.RotateRight(ir.GetRegister(m), ir.Imm8(rotate_by), ir.Imm1(0)).result;
 }
 
+bool ThumbTranslatorVisitor::thumb32_SXTB(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto result = ir.SignExtendByteToWord(ir.LeastSignificantByte(rotated));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index 6ac684d8..a40a07cc 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -122,6 +122,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_UDF();
 
     // thumb32 data processing (register) instructions
+    bool thumb32_SXTB(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);

From ad5d0d7b776bc2f6a2739ca4578ab0c932e6e33a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:20:43 -0500
Subject: [PATCH 10/12] thumb32: Implement SXTAB

---
 src/frontend/A32/decoder/thumb32.inc                |  2 +-
 .../impl/thumb32_data_processing_register.cpp       | 13 +++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index 9da07c30..0083caee 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -204,7 +204,7 @@ INST(thumb32_SXTAB16,        "SXTAB16",                  "111110100010nnnn1111dd
 INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111dddd10rrmmmm")
 INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011nnnn1111dddd10rrmmmm")
 INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111dddd10rrmmmm")
-//INST(thumb32_SXTAB,          "SXTAB",                    "111110100100----1111----1-------")
+INST(thumb32_SXTAB,          "SXTAB",                    "111110100100nnnn1111dddd10rrmmmm")
 //INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111----1-------")
 //INST(thumb32_UXTAB,          "UXTAB",                    "111110100101----1111----1-------")
 
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index e8c4358f..86945a2d 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -37,6 +37,19 @@ bool ThumbTranslatorVisitor::thumb32_SXTB16(Reg d, SignExtendRotation rotate, Re
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_SXTAB(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto reg_n = ir.GetRegister(n);
+    const auto result = ir.Add(reg_n, ir.SignExtendByteToWord(ir.LeastSignificantByte(rotated)));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index a40a07cc..db38df9b 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -124,6 +124,7 @@ struct ThumbTranslatorVisitor final {
     // thumb32 data processing (register) instructions
     bool thumb32_SXTB(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_SXTAB(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);

From d97369c252a738456f108c20d3287c07dcdc297a Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:22:22 -0500
Subject: [PATCH 11/12] thumb32: Implement UXTB

---
 src/frontend/A32/decoder/thumb32.inc                 |  2 +-
 .../impl/thumb32_data_processing_register.cpp        | 12 ++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index 0083caee..d1a3c019 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -205,7 +205,7 @@ INST(thumb32_UXTB16,         "UXTB16",                   "11111010001111111111dd
 INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011nnnn1111dddd10rrmmmm")
 INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111dddd10rrmmmm")
 INST(thumb32_SXTAB,          "SXTAB",                    "111110100100nnnn1111dddd10rrmmmm")
-//INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111----1-------")
+INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111dddd10rrmmmm")
 //INST(thumb32_UXTAB,          "UXTAB",                    "111110100101----1111----1-------")
 
 // Parallel Addition and Subtraction (signed)
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 86945a2d..2eb4cfaf 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -90,6 +90,18 @@ bool ThumbTranslatorVisitor::thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rota
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTB(Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto result = ir.ZeroExtendByteToWord(ir.LeastSignificantByte(rotated));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index db38df9b..5a4b5f4a 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -128,6 +128,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_SXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTB(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);

From e0d6b60270288b4c8b3a655505e176d988d167a7 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 10 Feb 2021 16:23:54 -0500
Subject: [PATCH 12/12] thumb32: Implement UXTAB

---
 src/frontend/A32/decoder/thumb32.inc                |  2 +-
 .../impl/thumb32_data_processing_register.cpp       | 13 +++++++++++++
 src/frontend/A32/translate/impl/translate_thumb.h   |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc
index d1a3c019..e03e2712 100644
--- a/src/frontend/A32/decoder/thumb32.inc
+++ b/src/frontend/A32/decoder/thumb32.inc
@@ -206,7 +206,7 @@ INST(thumb32_UXTAB16,        "UXTAB16",                  "111110100011nnnn1111dd
 INST(thumb32_SXTB,           "SXTB",                     "11111010010011111111dddd10rrmmmm")
 INST(thumb32_SXTAB,          "SXTAB",                    "111110100100nnnn1111dddd10rrmmmm")
 INST(thumb32_UXTB,           "UXTB",                     "11111010010111111111dddd10rrmmmm")
-//INST(thumb32_UXTAB,          "UXTAB",                    "111110100101----1111----1-------")
+INST(thumb32_UXTAB,          "UXTAB",                    "111110100101nnnn1111dddd10rrmmmm")
 
 // Parallel Addition and Subtraction (signed)
 INST(thumb32_SADD16,         "SADD16",                   "111110101001nnnn1111dddd0000mmmm")
diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
index 2eb4cfaf..cf6bbf7b 100644
--- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
+++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp
@@ -114,6 +114,19 @@ bool ThumbTranslatorVisitor::thumb32_UXTB16(Reg d, SignExtendRotation rotate, Re
     return true;
 }
 
+bool ThumbTranslatorVisitor::thumb32_UXTAB(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
+    if (d == Reg::PC || m == Reg::PC) {
+        return UnpredictableInstruction();
+    }
+
+    const auto rotated = Rotate(ir, m, rotate);
+    const auto reg_n = ir.GetRegister(n);
+    const auto result = ir.Add(reg_n, ir.ZeroExtendByteToWord(ir.LeastSignificantByte(rotated)));
+
+    ir.SetRegister(d, result);
+    return true;
+}
+
 bool ThumbTranslatorVisitor::thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m) {
     if (d == Reg::PC || m == Reg::PC) {
         return UnpredictableInstruction();
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index 5a4b5f4a..ceb54407 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -130,6 +130,7 @@ struct ThumbTranslatorVisitor final {
     bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTB(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m);
+    bool thumb32_UXTAB(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m);
     bool thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);