diff --git a/src/frontend/decoder/thumb1.h b/src/frontend/decoder/thumb1.h index 1e150417..e440bb52 100644 --- a/src/frontend/decoder/thumb1.h +++ b/src/frontend/decoder/thumb1.h @@ -56,7 +56,7 @@ private: }; template -static const std::array, 13> g_thumb1_instruction_table {{ +static const std::array, 14> g_thumb1_instruction_table {{ #define INST(fn, name, bitstring) detail::detail::GetMatcher(name, bitstring) @@ -67,7 +67,7 @@ static const std::array, 13> g_thumb1_instruction_table {{ { INST(&V::thumb1_ADD_reg_t1, "ADD (reg, T1)", "0001100mmmnnnddd") }, { INST(&V::thumb1_SUB_reg, "SUB (reg)", "0001101mmmnnnddd") }, { INST(&V::thumb1_ADD_imm, "ADD (imm)", "0001110vvvnnnddd") }, - //{ INST(&V::thumb1_SUB_rri, "SUB (rri)", "0001111mmmnnnddd") }, + { INST(&V::thumb1_SUB_imm, "SUB (imm)", "0001111vvvnnnddd") }, //{ INST(&V::thumb1_MOV_ri, "MOV (ri)", "00100dddvvvvvvvv") }, //{ INST(&V::thumb1_CMP_ri, "CMP (ri)", "00101dddvvvvvvvv") }, //{ INST(&V::thumb1_ADD_ri, "ADD (ri)", "00110dddvvvvvvvv") }, diff --git a/src/frontend/disassembler_thumb.cpp b/src/frontend/disassembler_thumb.cpp index 4395d3ef..0b66fe95 100644 --- a/src/frontend/disassembler_thumb.cpp +++ b/src/frontend/disassembler_thumb.cpp @@ -126,6 +126,10 @@ public: return Common::StringFromFormat("adds %s, %s, #%u", RegStr(d), RegStr(n), imm3); } + std::string thumb1_SUB_imm(Imm3 imm3, Reg n, Reg d) { + return Common::StringFromFormat("subs %s, %s, #%u", RegStr(d), RegStr(n), imm3); + } + std::string thumb1_AND_reg(Reg m, Reg d_n) { return Common::StringFromFormat("ands %s, %s", RegStr(d_n), RegStr(m)); } diff --git a/src/frontend/translate_thumb.cpp b/src/frontend/translate_thumb.cpp index 501dbd31..68dc47b6 100644 --- a/src/frontend/translate_thumb.cpp +++ b/src/frontend/translate_thumb.cpp @@ -98,6 +98,18 @@ struct TranslatorVisitor final { ir.SetVFlag(result.overflow); return true; } + bool thumb1_SUB_imm(Imm3 imm3, Reg n, Reg d) { + u32 imm32 = imm3 & 0x7; + // SUBS , , # + // Rd can never encode R15. + auto result = ir.SubWithCarry(ir.GetRegister(n), ir.Imm32(imm32), ir.Imm1(1)); + ir.SetRegister(d, result.result); + ir.SetNFlag(ir.MostSignificantBit(result.result)); + ir.SetZFlag(ir.IsZero(result.result)); + ir.SetCFlag(result.carry); + ir.SetVFlag(result.overflow); + return true; + } bool thumb1_AND_reg(Reg m, Reg d_n) { const Reg d = d_n, n = d_n;