suyu/dynarmic
26
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

thumb32: Implement REV16

Browse source
This commit is contained in:
Lioncash 2021-02-01 15:24:12 -05:00
parent cee31c5274
commit 0304dc7ce4
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/frontend/A32/decoder/thumb32.h
View file

@ -280,7 +280,7 @@ std::optional<std::reference_wrapper<const Thumb32Matcher<V>>> DecodeThumb32(u32
//INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"), //INST(&V::thumb32_QSUB, "QSUB", "111110101000----1111----1010----"),
//INST(&V::thumb32_QDSUB, "QDSUB", "111110101000----1111----1011----"), //INST(&V::thumb32_QDSUB, "QDSUB", "111110101000----1111----1011----"),
//INST(&V::thumb32_REV, "REV", "111110101001----1111----1000----"), //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_RBIT, "RBIT", "111110101001nnnn1111dddd1010mmmm"),
INST(&V::thumb32_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"), INST(&V::thumb32_REVSH, "REVSH", "111110101001nnnn1111dddd1011mmmm"),
INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"), INST(&V::thumb32_SEL, "SEL", "111110101010nnnn1111dddd1000mmmm"),

14
src/frontend/A32/translate/impl/thumb32_misc.cpp
View file

@ -44,6 +44,20 @@ bool ThumbTranslatorVisitor::thumb32_RBIT(Reg n, Reg d, Reg m) {
return true; 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) { bool ThumbTranslatorVisitor::thumb32_REVSH(Reg n, Reg d, Reg m) {
if (m != n || d == Reg::PC || m == Reg::PC) { if (m != n || d == Reg::PC || m == Reg::PC) {
return UnpredictableInstruction(); return UnpredictableInstruction();

1
src/frontend/A32/translate/impl/translate_thumb.h
View file

@ -119,6 +119,7 @@ struct ThumbTranslatorVisitor final {
// thumb32 miscellaneous instructions // thumb32 miscellaneous instructions
bool thumb32_CLZ(Reg n, Reg d, Reg m); bool thumb32_CLZ(Reg n, Reg d, Reg m);
bool thumb32_RBIT(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_REVSH(Reg n, Reg d, Reg m);
bool thumb32_SEL(Reg n, Reg d, Reg m); bool thumb32_SEL(Reg n, Reg d, Reg m);
}; };

7
tests/A32/fuzz_thumb.cpp
View file

@ -376,6 +376,13 @@ TEST_CASE("Fuzz Thumb32 instructions set", "[JitX64][Thumb][Thumb32]") {
const auto n = Common::Bits<16, 19>(inst); const auto n = Common::Bits<16, 19>(inst);
return m == n && d != 15 && m != 15; 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 ThumbInstGen("111110101001nnnn1111dddd1011mmmm", // REVSH
[](u32 inst) { [](u32 inst) {
const auto d = Common::Bits<8, 11>(inst); const auto d = Common::Bits<8, 11>(inst);