From 0304dc7ce4eac210d70e19433f1cf3bf31962007 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:24:12 -0500 Subject: [PATCH] thumb32: Implement REV16 --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 14 ++++++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 7 +++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index 1e877c03..862ca7c1 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -280,7 +280,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"), //INST(&V::thumb32_QDSUB, "QDSUB", "111110101000----1111----1011----"), //INST(&V::thumb32_REV, "REV", "111110101001----1111----1000----"), - //INST(&V::thumb32_REV16, "REV16", "111110101001----1111----1001----"), + INST(&V::thumb32_REV16, "REV16", "111110101001nnnn1111dddd1001mmmm"), INST(&V::thumb32_RBIT, "RBIT", "111110101001nnnn1111dddd1010mmmm"), INST(&V::thumb32_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"), INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index e233a33f..dcf16b9d 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -44,6 +44,20 @@ bool ThumbTranslatorVisitor::thumb32_RBIT(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_REV16(Reg n, Reg d, Reg m) { + if (m != n || d == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto reg_m = ir.GetRegister(m); + const auto lo = ir.And(ir.LogicalShiftRight(reg_m, ir.Imm8(8), ir.Imm1(0)).result, ir.Imm32(0x00FF00FF)); + const auto hi = ir.And(ir.LogicalShiftLeft(reg_m, ir.Imm8(8), ir.Imm1(0)).result, ir.Imm32(0xFF00FF00)); + const auto result = ir.Or(lo, hi); + + ir.SetRegister(d, result); + return true; +} + bool ThumbTranslatorVisitor::thumb32_REVSH(Reg n, Reg d, Reg m) { if (m != n || 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 951a7413..0965e28f 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -119,6 +119,7 @@ struct ThumbTranslatorVisitor final { // thumb32 miscellaneous instructions bool thumb32_CLZ(Reg n, Reg d, Reg m); bool thumb32_RBIT(Reg n, Reg d, Reg m); + bool thumb32_REV16(Reg n, Reg d, Reg m); bool thumb32_REVSH(Reg n, Reg d, Reg m); bool thumb32_SEL(Reg n, Reg d, Reg m); }; diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index abdf5ea4..5a4d87d0 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -376,6 +376,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("111110101001nnnn1111dddd1001mmmm", // REV16 + [](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 m == n && d != 15 && m != 15; + }), ThumbInstGen("111110101001nnnn1111dddd1011mmmm", // REVSH [](u32 inst) { const auto d = Common::Bits<8, 11>(inst);