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] 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);