From 8d530487503053d79f26f4b8e16d265eccbc7771 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 13:52:06 -0500 Subject: [PATCH 01/11] thumb32: Implement CLZ Also fleshes out the generator to allow for generating thumb32 instructions as well. --- src/CMakeLists.txt | 1 + src/frontend/A32/decoder/thumb32.h | 2 +- .../A32/translate/impl/thumb32_misc.cpp | 22 +++ .../A32/translate/impl/translate_thumb.h | 3 + tests/A32/fuzz_thumb.cpp | 126 ++++++++++++++---- 5 files changed, 127 insertions(+), 27 deletions(-) create mode 100644 src/frontend/A32/translate/impl/thumb32_misc.cpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 10533571..487384ed 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -151,6 +151,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_misc.cpp frontend/A32/translate/impl/translate_arm.h frontend/A32/translate/impl/translate_thumb.h frontend/A32/translate/impl/vfp.cpp diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index cc6ca9d2..a12ea104 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -284,7 +284,7 @@ std::optional>> DecodeThumb32(u32 //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_CLZ, "CLZ", "111110101011----1111----1000----"), + INST(&V::thumb32_CLZ, "CLZ", "111110101011nnnn1111dddd1000mmmm"), // Multiply, Multiply Accumulate, and Absolute Difference //INST(&V::thumb32_MUL, "MUL", "111110110000----1111----0000----"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp new file mode 100644 index 00000000..9c2ca2aa --- /dev/null +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -0,0 +1,22 @@ +/* This file is part of the dynarmic project. + * Copyright (c) 2016 MerryMage + * SPDX-License-Identifier: 0BSD + */ + +#include "frontend/A32/translate/impl/translate_thumb.h" + +namespace Dynarmic::A32 { + +bool ThumbTranslatorVisitor::thumb32_CLZ(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 result = ir.CountLeadingZeros(reg_m); + + 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 839c3ff2..980502e2 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -115,6 +115,9 @@ struct ThumbTranslatorVisitor final { bool thumb32_BL_imm(Imm<11> hi, Imm<11> lo); bool thumb32_BLX_imm(Imm<11> hi, Imm<11> lo); bool thumb32_UDF(); + + // thumb32 miscellaneous instructions + bool thumb32_CLZ(Reg n, Reg d, Reg m); }; } // namespace Dynarmic::A32 diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 7daae415..598ab221 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -41,11 +42,13 @@ using WriteRecords = std::map; struct ThumbInstGen final { public: - ThumbInstGen(const char* format, std::function is_valid = [](u16){ return true; }) : is_valid(is_valid) { - REQUIRE(strlen(format) == 16); + ThumbInstGen(std::string_view format, std::function is_valid = [](u32){ return true; }) : is_valid(is_valid) { + REQUIRE((format.size() == 16 || format.size() == 32)); - for (int i = 0; i < 16; i++) { - const u16 bit = 1 << (15 - i); + const auto bit_size = format.size(); + + for (size_t i = 0; i < bit_size; i++) { + const u32 bit = 1U << (bit_size - 1 - i); switch (format[i]) { case '0': mask |= bit; @@ -60,11 +63,25 @@ public: } } } - u16 Generate() const { - u16 inst; + + u16 Generate16() const { + u32 inst; do { - const u16 random = RandInt(0, 0xFFFF); + const auto random = RandInt(0, 0xFFFF); + inst = bits | (random & ~mask); + } while (!is_valid(inst)); + + ASSERT((inst & mask) == bits); + + return static_cast(inst); + } + + u32 Generate32() const { + u32 inst; + + do { + const auto random = RandInt(0, 0xFFFFFFFF); inst = bits | (random & ~mask); } while (!is_valid(inst)); @@ -72,10 +89,11 @@ public: return inst; } + private: - u16 bits = 0; - u16 mask = 0; - std::function is_valid; + u32 bits = 0; + u32 mask = 0; + std::function is_valid; }; static bool DoesBehaviorMatch(const A32Unicorn& uni, const A32::Jit& jit, @@ -179,7 +197,7 @@ static void RunInstance(size_t run_number, ThumbTestEnv& test_env, A32Unicorn instruction_generator) { +void FuzzJitThumb16(const size_t instruction_count, const size_t instructions_to_execute_count, const size_t run_count, const std::function instruction_generator) { ThumbTestEnv test_env; // Prepare memory. @@ -201,6 +219,36 @@ void FuzzJitThumb(const size_t instruction_count, const size_t instructions_to_e } } +void FuzzJitThumb32(const size_t instruction_count, const size_t instructions_to_execute_count, const size_t run_count, const std::function instruction_generator) { + ThumbTestEnv test_env; + + // Prepare memory. + // A Thumb-32 instruction is 32-bits so we multiply our count + test_env.code_mem.resize(instruction_count * 2 + 1); + test_env.code_mem.back() = 0xE7FE; // b +#0 + + // Prepare test subjects + A32Unicorn uni{test_env}; + A32::Jit jit{GetUserConfig(&test_env)}; + + for (size_t run_number = 0; run_number < run_count; run_number++) { + ThumbTestEnv::RegisterArray initial_regs; + std::generate_n(initial_regs.begin(), initial_regs.size() - 1, []{ return RandInt(0, 0xFFFFFFFF); }); + initial_regs[15] = 0; + + for (size_t i = 0; i < instruction_count; i++) { + const auto instruction = instruction_generator(); + const auto first_halfword = static_cast(Common::Bits<0, 15>(instruction)); + const auto second_halfword = static_cast(Common::Bits<16, 31>(instruction)); + + test_env.code_mem[i * 2 + 0] = second_halfword; + test_env.code_mem[i * 2 + 1] = first_halfword; + } + + RunInstance(run_number, test_env, uni, jit, initial_regs, instruction_count, instructions_to_execute_count); + } +} + TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { const std::array instructions = { ThumbInstGen("00000xxxxxxxxxxx"), // LSL , , # @@ -212,9 +260,9 @@ TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { ThumbInstGen("010000ooooxxxxxx"), // Data Processing ThumbInstGen("010001000hxxxxxx"), // ADD (high registers) ThumbInstGen("0100010101xxxxxx", // CMP (high registers) - [](u16 inst){ return Common::Bits<3, 5>(inst) != 0b111; }), // R15 is UNPREDICTABLE + [](u32 inst){ return Common::Bits<3, 5>(inst) != 0b111; }), // R15 is UNPREDICTABLE ThumbInstGen("0100010110xxxxxx", // CMP (high registers) - [](u16 inst){ return Common::Bits<0, 2>(inst) != 0b111; }), // R15 is UNPREDICTABLE + [](u32 inst){ return Common::Bits<0, 2>(inst) != 0b111; }), // R15 is UNPREDICTABLE ThumbInstGen("010001100hxxxxxx"), // MOV (high registers) ThumbInstGen("10110000oxxxxxxx"), // Adjust stack pointer ThumbInstGen("10110010ooxxxxxx"), // SXT/UXT @@ -227,11 +275,11 @@ TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { ThumbInstGen("1000xxxxxxxxxxxx"), // LDRH/STRH Rd, [Rn, #offset] ThumbInstGen("1001xxxxxxxxxxxx"), // LDR/STR Rd, [SP, #] ThumbInstGen("1011010xxxxxxxxx", // PUSH - [](u16 inst){ return Common::Bits<0, 7>(inst) != 0; }), // Empty reg_list is UNPREDICTABLE + [](u32 inst){ return Common::Bits<0, 7>(inst) != 0; }), // Empty reg_list is UNPREDICTABLE ThumbInstGen("10111100xxxxxxxx", // POP (P = 0) - [](u16 inst){ return Common::Bits<0, 7>(inst) != 0; }), // Empty reg_list is UNPREDICTABLE + [](u32 inst){ return Common::Bits<0, 7>(inst) != 0; }), // Empty reg_list is UNPREDICTABLE ThumbInstGen("1100xxxxxxxxxxxx", // STMIA/LDMIA - [](u16 inst) { + [](u32 inst) { // Ensure that the architecturally undefined case of // the base register being within the list isn't hit. const u32 rn = Common::Bits<8, 10>(inst); @@ -247,24 +295,24 @@ TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { }; const auto instruction_select = [&]() -> u16 { - size_t inst_index = RandInt(0, instructions.size() - 1); + const auto inst_index = RandInt(0, instructions.size() - 1); - return instructions[inst_index].Generate(); + return instructions[inst_index].Generate16(); }; SECTION("single instructions") { - FuzzJitThumb(1, 2, 10000, instruction_select); + FuzzJitThumb16(1, 2, 10000, instruction_select); } SECTION("short blocks") { - FuzzJitThumb(5, 6, 3000, instruction_select); + FuzzJitThumb16(5, 6, 3000, instruction_select); } // TODO: Test longer blocks when Unicorn can consistently // run these without going into an infinite loop. #if 0 SECTION("long blocks") { - FuzzJitThumb(1024, 1025, 1000, instruction_select); + FuzzJitThumb16(1024, 1025, 1000, instruction_select); } #endif } @@ -278,7 +326,7 @@ TEST_CASE("Fuzz Thumb instructions set 2 (affects PC)", "[JitX64][Thumb]") { // must not be address<1:0> == '10'. #if 0 ThumbInstGen("01000111xmmmm000", // BLX/BX - [](u16 inst){ + [](u32 inst){ const u32 Rm = Common::Bits<3, 6>(inst); return Rm != 15; }), @@ -288,7 +336,7 @@ TEST_CASE("Fuzz Thumb instructions set 2 (affects PC)", "[JitX64][Thumb]") { ThumbInstGen("01000100h0xxxxxx"), // ADD (high registers) ThumbInstGen("01000110h0xxxxxx"), // MOV (high registers) ThumbInstGen("1101ccccxxxxxxxx", // B - [](u16 inst){ + [](u32 inst){ const u32 c = Common::Bits<9, 12>(inst); return c < 0b1110; // Don't want SWI or undefined instructions. }), @@ -304,12 +352,38 @@ TEST_CASE("Fuzz Thumb instructions set 2 (affects PC)", "[JitX64][Thumb]") { }; const auto instruction_select = [&]() -> u16 { - size_t inst_index = RandInt(0, instructions.size() - 1); + const auto inst_index = RandInt(0, instructions.size() - 1); - return instructions[inst_index].Generate(); + return instructions[inst_index].Generate16(); }; - FuzzJitThumb(1, 1, 10000, instruction_select); + FuzzJitThumb16(1, 1, 10000, instruction_select); +} + +TEST_CASE("Fuzz Thumb32 instructions set", "[JitX64][Thumb][Thumb32]") { + const std::array instructions = { + ThumbInstGen("111110101011nnnn1111dddd1000mmmm", // CLZ + [](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; + }), + }; + + const auto instruction_select = [&]() -> u32 { + const auto inst_index = RandInt(0, instructions.size() - 1); + + return instructions[inst_index].Generate32(); + }; + + SECTION("single instructions") { + FuzzJitThumb32(1, 2, 10000, instruction_select); + } + + SECTION("short blocks") { + FuzzJitThumb32(5, 6, 3000, instruction_select); + } } TEST_CASE("Verify fix for off by one error in MemoryRead32 worked", "[Thumb]") { From 1ad99bb9b5218e464cf22e1c9b896fec286b84b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:01:21 -0500 Subject: [PATCH 02/11] 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 { From 95dabcf48e4fbdd1090e69ce41cea0c6bd359668 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:04:29 -0500 Subject: [PATCH 03/11] fuzz_thumb: Allow running only Thumb-16 tests --- tests/A32/fuzz_thumb.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 0b20dc92..e4d1b984 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -249,7 +249,7 @@ void FuzzJitThumb32(const size_t instruction_count, const size_t instructions_to } } -TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { +TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb][Thumb16]") { const std::array instructions = { ThumbInstGen("00000xxxxxxxxxxx"), // LSL , , # ThumbInstGen("00001xxxxxxxxxxx"), // LSR , , # @@ -317,7 +317,7 @@ TEST_CASE("Fuzz Thumb instructions set 1", "[JitX64][Thumb]") { #endif } -TEST_CASE("Fuzz Thumb instructions set 2 (affects PC)", "[JitX64][Thumb]") { +TEST_CASE("Fuzz Thumb instructions set 2 (affects PC)", "[JitX64][Thumb][Thumb16]") { const std::array instructions = { // TODO: We currently can't test BX/BLX as we have // no way of preventing the unpredictable @@ -393,7 +393,7 @@ TEST_CASE("Fuzz Thumb32 instructions set", "[JitX64][Thumb][Thumb32]") { } } -TEST_CASE("Verify fix for off by one error in MemoryRead32 worked", "[Thumb]") { +TEST_CASE("Verify fix for off by one error in MemoryRead32 worked", "[Thumb][Thumb16]") { ThumbTestEnv test_env; // Prepare test subjects From e2bc7eeb93c3494d06fc0fab8ae5653781237f08 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:10:08 -0500 Subject: [PATCH 04/11] thumb32: Implement REVSH --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 12 ++++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 9 ++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index bf36e254..8acdbc85 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -282,7 +282,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_REV, "REV", "111110101001----1111----1000----"), //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_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"), INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"), INST(&V::thumb32_CLZ, "CLZ", "111110101011nnnn1111dddd1000mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index a269cae3..9f0b228a 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,6 +19,18 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_REVSH(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 rev_half = ir.ByteReverseHalf(ir.LeastSignificantHalf(reg_m)); + + ir.SetRegister(d, ir.SignExtendHalfToWord(rev_half)); + return true; +} + bool ThumbTranslatorVisitor::thumb32_SEL(Reg n, Reg d, Reg m) { if (d == Reg::PC || n == 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 4ddc0354..5866bab2 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_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 e4d1b984..f1b9ca0e 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -369,7 +369,14 @@ 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", + ThumbInstGen("111110101001nnnn1111dddd1011mmmm", // REVSH + [](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("111110101010nnnn1111dddd1000mmmm", // SEL [](u32 inst) { const auto d = Common::Bits<8, 11>(inst); const auto m = Common::Bits<0, 3>(inst); From cee31c5274179800f0ef6067db2cddea4897a083 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:20:24 -0500 Subject: [PATCH 05/11] thumb32: Implement RBIT --- src/frontend/A32/decoder/thumb32.h | 2 +- .../A32/translate/impl/thumb32_misc.cpp | 25 +++++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 7 ++++++ 4 files changed, 34 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index 8acdbc85..1e877c03 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -281,7 +281,7 @@ std::optional>> DecodeThumb32(u32 //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_RBIT, "RBIT", "111110101001----1111----1010----"), + INST(&V::thumb32_RBIT, "RBIT", "111110101001nnnn1111dddd1010mmmm"), INST(&V::thumb32_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"), INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"), INST(&V::thumb32_CLZ, "CLZ", "111110101011nnnn1111dddd1000mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index 9f0b228a..e233a33f 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,6 +19,31 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_RBIT(Reg n, Reg d, Reg m) { + if (m != n || d == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const IR::U32 swapped = ir.ByteReverseWord(ir.GetRegister(m)); + + // ((x & 0xF0F0F0F0) >> 4) | ((x & 0x0F0F0F0F) << 4) + const IR::U32 first_lsr = ir.LogicalShiftRight(ir.And(swapped, ir.Imm32(0xF0F0F0F0)), ir.Imm8(4)); + const IR::U32 first_lsl = ir.LogicalShiftLeft(ir.And(swapped, ir.Imm32(0x0F0F0F0F)), ir.Imm8(4)); + const IR::U32 corrected = ir.Or(first_lsl, first_lsr); + + // ((x & 0x88888888) >> 3) | ((x & 0x44444444) >> 1) | + // ((x & 0x22222222) << 1) | ((x & 0x11111111) << 3) + const IR::U32 second_lsr = ir.LogicalShiftRight(ir.And(corrected, ir.Imm32(0x88888888)), ir.Imm8(3)); + const IR::U32 third_lsr = ir.LogicalShiftRight(ir.And(corrected, ir.Imm32(0x44444444)), ir.Imm8(1)); + const IR::U32 second_lsl = ir.LogicalShiftLeft(ir.And(corrected, ir.Imm32(0x22222222)), ir.Imm8(1)); + const IR::U32 third_lsl = ir.LogicalShiftLeft(ir.And(corrected, ir.Imm32(0x11111111)), ir.Imm8(3)); + + const IR::U32 result = ir.Or(ir.Or(ir.Or(second_lsr, third_lsr), second_lsl), third_lsl); + + 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 5866bab2..951a7413 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_RBIT(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 f1b9ca0e..abdf5ea4 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("111110101001nnnn1111dddd1010mmmm", // RBIT + [](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); From 0304dc7ce4eac210d70e19433f1cf3bf31962007 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:24:12 -0500 Subject: [PATCH 06/11] 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); From c60cf921ee0401243e709c7861eb9c332cc7d300 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:29:52 -0500 Subject: [PATCH 07/11] thumb32: Implement REV --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 11 +++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 7 +++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index 862ca7c1..a4213209 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -279,7 +279,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_QDADD, "QDADD", "111110101000----1111----1001----"), //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_REV, "REV", "111110101001nnnn1111dddd1000mmmm"), INST(&V::thumb32_REV16, "REV16", "111110101001nnnn1111dddd1001mmmm"), INST(&V::thumb32_RBIT, "RBIT", "111110101001nnnn1111dddd1010mmmm"), INST(&V::thumb32_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index dcf16b9d..0d856c50 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -44,6 +44,17 @@ bool ThumbTranslatorVisitor::thumb32_RBIT(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_REV(Reg n, Reg d, Reg m) { + if (m != n || d == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto result = ir.ByteReverseWord(ir.GetRegister(m)); + + ir.SetRegister(d, result); + return true; +} + bool ThumbTranslatorVisitor::thumb32_REV16(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 0965e28f..d5a8f63f 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_REV(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 5a4d87d0..e6b4dbd3 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("111110101001nnnn1111dddd1000mmmm", // REV + [](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("111110101001nnnn1111dddd1001mmmm", // REV16 [](u32 inst) { const auto d = Common::Bits<8, 11>(inst); From d96c8c662b1d63bc8976abacb2f83ffc9e140d86 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:35:09 -0500 Subject: [PATCH 08/11] thumb32: Implement QDSUB --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 16 ++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index a4213209..96ab0e8f 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -278,7 +278,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_QADD, "QADD", "111110101000----1111----1000----"), //INST(&V::thumb32_QDADD, "QDADD", "111110101000----1111----1001----"), //INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"), - //INST(&V::thumb32_QDSUB, "QDSUB", "111110101000----1111----1011----"), + INST(&V::thumb32_QDSUB, "QDSUB", "111110101000nnnn1111dddd1011mmmm"), INST(&V::thumb32_REV, "REV", "111110101001nnnn1111dddd1000mmmm"), INST(&V::thumb32_REV16, "REV16", "111110101001nnnn1111dddd1001mmmm"), INST(&V::thumb32_RBIT, "RBIT", "111110101001nnnn1111dddd1010mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index 0d856c50..f443139f 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,6 +19,22 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_QDSUB(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 doubled_n = ir.SignedSaturatedAdd(reg_n, reg_n); + ir.OrQFlag(doubled_n.overflow); + + const auto result = ir.SignedSaturatedSub(reg_m, doubled_n.result); + ir.SetRegister(d, result.result); + ir.OrQFlag(result.overflow); + return true; +} + bool ThumbTranslatorVisitor::thumb32_RBIT(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 d5a8f63f..e9ab940f 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_QDSUB(Reg n, Reg d, Reg m); bool thumb32_RBIT(Reg n, Reg d, Reg m); bool thumb32_REV(Reg n, Reg d, Reg m); bool thumb32_REV16(Reg n, Reg d, Reg m); From 65365ad2a3686db731a8bca706053841b92c8164 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:39:15 -0500 Subject: [PATCH 09/11] thumb32: Implement QDADD --- src/frontend/A32/decoder/thumb32.h | 2 +- src/frontend/A32/translate/impl/thumb32_misc.cpp | 16 ++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + tests/A32/fuzz_thumb.cpp | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.h b/src/frontend/A32/decoder/thumb32.h index 96ab0e8f..48f4a386 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -276,7 +276,7 @@ std::optional>> DecodeThumb32(u32 // Miscellaneous Operations //INST(&V::thumb32_QADD, "QADD", "111110101000----1111----1000----"), - //INST(&V::thumb32_QDADD, "QDADD", "111110101000----1111----1001----"), + INST(&V::thumb32_QDADD, "QDADD", "111110101000nnnn1111dddd1001mmmm"), //INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"), INST(&V::thumb32_QDSUB, "QDSUB", "111110101000nnnn1111dddd1011mmmm"), INST(&V::thumb32_REV, "REV", "111110101001nnnn1111dddd1000mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index f443139f..9eed49cb 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,6 +19,22 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_QDADD(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 doubled_n = ir.SignedSaturatedAdd(reg_n, reg_n); + ir.OrQFlag(doubled_n.overflow); + + const auto result = ir.SignedSaturatedAdd(reg_m, doubled_n.result); + ir.SetRegister(d, result.result); + ir.OrQFlag(result.overflow); + return true; +} + bool ThumbTranslatorVisitor::thumb32_QDSUB(Reg n, Reg d, Reg m) { if (d == Reg::PC || n == 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 e9ab940f..0fb9a5ca 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_QDADD(Reg n, Reg d, Reg m); bool thumb32_QDSUB(Reg n, Reg d, Reg m); bool thumb32_RBIT(Reg n, Reg d, Reg m); bool thumb32_REV(Reg n, Reg d, Reg m); diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index e6b4dbd3..90a57507 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -369,6 +369,20 @@ 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("111110101000nnnn1111dddd1001mmmm", // QDADD + [](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; + }), + ThumbInstGen("111110101000nnnn1111dddd1011mmmm", // QDSUB + [](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; + }), ThumbInstGen("111110101001nnnn1111dddd1010mmmm", // RBIT [](u32 inst) { const auto d = Common::Bits<8, 11>(inst); From cd6e4c7afd8d2a59add719292e6d69d95dfbe703 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:42:14 -0500 Subject: [PATCH 10/11] thumb32: Implement QSUB --- 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 48f4a386..b097f478 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -277,7 +277,7 @@ std::optional>> DecodeThumb32(u32 // Miscellaneous Operations //INST(&V::thumb32_QADD, "QADD", "111110101000----1111----1000----"), INST(&V::thumb32_QDADD, "QDADD", "111110101000nnnn1111dddd1001mmmm"), - //INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"), + INST(&V::thumb32_QSUB, "QSUB", "111110101000nnnn1111dddd1010mmmm"), INST(&V::thumb32_QDSUB, "QDSUB", "111110101000nnnn1111dddd1011mmmm"), INST(&V::thumb32_REV, "REV", "111110101001nnnn1111dddd1000mmmm"), INST(&V::thumb32_REV16, "REV16", "111110101001nnnn1111dddd1001mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index 9eed49cb..34c9e50e 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -51,6 +51,20 @@ bool ThumbTranslatorVisitor::thumb32_QDSUB(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_QSUB(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.SignedSaturatedSub(reg_m, reg_n); + + ir.SetRegister(d, result.result); + ir.OrQFlag(result.overflow); + return true; +} + bool ThumbTranslatorVisitor::thumb32_RBIT(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 0fb9a5ca..9e8f40de 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -120,6 +120,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_CLZ(Reg n, Reg d, Reg m); bool thumb32_QDADD(Reg n, Reg d, Reg m); bool thumb32_QDSUB(Reg n, Reg d, Reg m); + bool thumb32_QSUB(Reg n, Reg d, Reg m); bool thumb32_RBIT(Reg n, Reg d, Reg m); bool thumb32_REV(Reg n, Reg d, Reg m); bool thumb32_REV16(Reg n, Reg d, Reg m); diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 90a57507..1cc596ba 100644 --- a/tests/A32/fuzz_thumb.cpp +++ b/tests/A32/fuzz_thumb.cpp @@ -383,6 +383,13 @@ TEST_CASE("Fuzz Thumb32 instructions set", "[JitX64][Thumb][Thumb32]") { const auto n = Common::Bits<16, 19>(inst); return d != 15 && m != 15 && n != 15; }), + ThumbInstGen("111110101000nnnn1111dddd1010mmmm", // QSUB + [](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; + }), ThumbInstGen("111110101001nnnn1111dddd1010mmmm", // RBIT [](u32 inst) { const auto d = Common::Bits<8, 11>(inst); From 36fc596a517494bf54d11547f36c16c6f2f945f7 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 1 Feb 2021 15:44:09 -0500 Subject: [PATCH 11/11] thumb32: Implement QADD --- 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 b097f478..954a36f7 100644 --- a/src/frontend/A32/decoder/thumb32.h +++ b/src/frontend/A32/decoder/thumb32.h @@ -275,7 +275,7 @@ std::optional>> DecodeThumb32(u32 //INST(&V::thumb32_UHSUB8, "UHSUB8", "111110101100----1111----0110----"), // Miscellaneous Operations - //INST(&V::thumb32_QADD, "QADD", "111110101000----1111----1000----"), + INST(&V::thumb32_QADD, "QADD", "111110101000nnnn1111dddd1000mmmm"), INST(&V::thumb32_QDADD, "QDADD", "111110101000nnnn1111dddd1001mmmm"), INST(&V::thumb32_QSUB, "QSUB", "111110101000nnnn1111dddd1010mmmm"), INST(&V::thumb32_QDSUB, "QDSUB", "111110101000nnnn1111dddd1011mmmm"), diff --git a/src/frontend/A32/translate/impl/thumb32_misc.cpp b/src/frontend/A32/translate/impl/thumb32_misc.cpp index 34c9e50e..c2808735 100644 --- a/src/frontend/A32/translate/impl/thumb32_misc.cpp +++ b/src/frontend/A32/translate/impl/thumb32_misc.cpp @@ -19,6 +19,20 @@ bool ThumbTranslatorVisitor::thumb32_CLZ(Reg n, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_QADD(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.SignedSaturatedAdd(reg_m, reg_n); + + ir.SetRegister(d, result.result); + ir.OrQFlag(result.overflow); + return true; +} + bool ThumbTranslatorVisitor::thumb32_QDADD(Reg n, Reg d, Reg m) { if (d == Reg::PC || n == 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 9e8f40de..2dfe5d8a 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_QADD(Reg n, Reg d, Reg m); bool thumb32_QDADD(Reg n, Reg d, Reg m); bool thumb32_QDSUB(Reg n, Reg d, Reg m); bool thumb32_QSUB(Reg n, Reg d, Reg m); diff --git a/tests/A32/fuzz_thumb.cpp b/tests/A32/fuzz_thumb.cpp index 1cc596ba..dbc5dece 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("111110101000nnnn1111dddd1000mmmm", // QADD + [](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; + }), ThumbInstGen("111110101000nnnn1111dddd1001mmmm", // QDADD [](u32 inst) { const auto d = Common::Bits<8, 11>(inst);