diff --git a/src/frontend/decoder/thumb1.h b/src/frontend/decoder/thumb1.h index d5c30ed7..76039d2b 100644 --- a/src/frontend/decoder/thumb1.h +++ b/src/frontend/decoder/thumb1.h @@ -56,7 +56,7 @@ private: }; template -static const std::array, 18> g_thumb1_instruction_table {{ +static const std::array, 19> g_thumb1_instruction_table {{ #define INST(fn, name, bitstring) detail::detail::GetMatcher(name, bitstring) @@ -79,7 +79,7 @@ static const std::array, 18> g_thumb1_instruction_table {{ { INST(&V::thumb1_LSL_reg, "LSL (reg)", "0100000010mmmddd") }, { INST(&V::thumb1_LSR_reg, "LSR (reg)", "0100000011mmmddd") }, { INST(&V::thumb1_ASR_reg, "ASR (reg)", "0100000100mmmddd") }, - //{ INST(&V::thumb1_ADCS_rr, "ADCS (rr)", "0100000101mmmddd") }, + { INST(&V::thumb1_ADC_reg, "ADC (reg)", "0100000101mmmddd") }, //{ INST(&V::thumb1_SBCS_rr, "SBCS (rr)", "0100000110mmmddd") }, //{ INST(&V::thumb1_RORS_rr, "RORS (rr)", "0100000111sssddd") }, //{ INST(&V::thumb1_TST_rr, "TST (rr)", "0100001000mmmnnn") }, diff --git a/src/frontend/disassembler_thumb.cpp b/src/frontend/disassembler_thumb.cpp index 032f4e31..c39aef55 100644 --- a/src/frontend/disassembler_thumb.cpp +++ b/src/frontend/disassembler_thumb.cpp @@ -166,6 +166,10 @@ public: return Common::StringFromFormat("asrs %s, %s", RegStr(d_n), RegStr(m)); } + std::string thumb1_ADC_reg(Reg m, Reg d_n) { + return Common::StringFromFormat("adcs %s, %s", RegStr(d_n), RegStr(m)); + } + std::string thumb1_ADD_reg_t2(bool d_n_hi, Reg m, Reg d_n_lo) { Reg d_n = d_n_hi ? (d_n_lo + 8) : d_n_lo; return Common::StringFromFormat("add %s, %s", RegStr(d_n), RegStr(m)); diff --git a/src/frontend/translate_thumb.cpp b/src/frontend/translate_thumb.cpp index 38974815..a87e114f 100644 --- a/src/frontend/translate_thumb.cpp +++ b/src/frontend/translate_thumb.cpp @@ -213,6 +213,19 @@ struct TranslatorVisitor final { ir.SetCFlag(result.carry); return true; } + bool thumb1_ADC_reg(Reg m, Reg d_n) { + Reg d = d_n, n = d_n; + // ADCS , + // Note that it is not possible to encode Rd == R15. + auto aspr_c = ir.GetCFlag(); + auto result = ir.AddWithCarry(ir.GetRegister(n), ir.GetRegister(m), aspr_c); + 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_ADD_reg_t2(bool d_n_hi, Reg m, Reg d_n_lo) { Reg d_n = d_n_hi ? (d_n_lo + 8) : d_n_lo;