From 1ad99bb9b5218e464cf22e1c9b896fec286b84b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:01:21 -0500 Subject: [PATCH] thumb32: Implement SEL --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 13 +++++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index a12ea104..bf36e254 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -283,7 +283,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_REV16, "REV16", "111110101001----1111----1001----"), //INST(&V::thumb32_RBIT, "RBIT", "111110101001----1111----1010----"), //INST(&V::thumb32_REVSH, "REVSH", "111110101001----1111----1011----"), - //INST(&V::thumb32_SEL, "SEL", "111110101010----1111----1000----"), + INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"), INST(&V::thumb32_CLZ, "CLZ", "111110101011nnnn1111dddd1000mmmm"), // Multiply, Multiply Accumulate, and Absolute Difference diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index 9c2ca2aa..a269cae3 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,4 +19,17 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_SEL(Reg n, Reg d, Reg m) { + if (d == Reg::PC || n == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto reg_m = ir.GetRegister(m); + const auto reg_n = ir.GetRegister(n); + const auto result = ir.PackedSelect(ir.GetGEFlags(), reg_m, reg_n); + + 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 980502e2..4ddc0354 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -118,6 +118,7 @@ struct ThumbTranslatorVisitor final { // thumb32 miscellaneous instructions bool thumb32_CLZ(Reg n, Reg d, Reg m); + bool thumb32_SEL(Reg n, Reg d, Reg m); }; } // namespace Dynarmic::A32 diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 598ab221..0b20dc92 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -369,6 +369,13 @@ TEST_CASE("Fuzz Thumb32 instructions set", "[JitX64][Thumb][Thumb32]") { const auto n = Common::Bits<16, 19>(inst); return m == n && d != 15 && m != 15; }), + ThumbInstGen("111110101010nnnn1111dddd1000mmmm", + [](u32 inst) { + const auto d = Common::Bits<8, 11>(inst); + const auto m = Common::Bits<0, 3>(inst); + const auto n = Common::Bits<16, 19>(inst); + return d != 15 && m != 15 && n != 15; + }), }; const auto instruction_select = [&]() -> u32 {