From 95189b78efae6fbcefe30c54c6860cafca305b05 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 6 Mar 2021 19:42:28 +0000 Subject: [PATCH] thumb32: Implement ADC (reg) --- src/frontend/A32/decoder/thumb32.inc | 2 +- ...thumb32_data_processing_shifted_register.cpp | 17 +++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index 83d1fab7..19c8560e 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -41,7 +41,7 @@ INST(thumb32_EOR_reg, "EOR (reg)", "11101010100Snnnn0vvvdd INST(thumb32_PKH, "PKH", "111010101100nnnn0vvvddddvvt0mmmm") INST(thumb32_CMN_reg, "CMN (reg)", "111010110001nnnn0vvv1111vvttmmmm") INST(thumb32_ADD_reg, "ADD (reg)", "11101011000Snnnn0vvvddddvvttmmmm") -//INST(thumb32_ADC_reg, "ADC (reg)", "11101011010---------------------") +INST(thumb32_ADC_reg, "ADC (reg)", "11101011010Snnnn0vvvddddvvttmmmm") //INST(thumb32_SBC_reg, "SBC (reg)", "11101011011---------------------") //INST(thumb32_CMP_reg, "CMP (reg)", "111010111011--------1111--------") //INST(thumb32_SUB_reg, "SUB (reg)", "11101011101---------------------") diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp index eef1ab31..e137e6ec 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp +++ b/src/frontend/A32/translate/impl/thumb32_data_processing_shifted_register.cpp @@ -204,4 +204,21 @@ bool ThumbTranslatorVisitor::thumb32_ADD_reg(bool S, Reg n, Imm<3> imm3, Reg d, return true; } +bool ThumbTranslatorVisitor::thumb32_ADC_reg(bool S, Reg n, Imm<3> imm3, Reg d, Imm<2> imm2, ShiftType type, Reg m) { + if (d == Reg::PC || n == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto shifted = EmitImmShift(ir.GetRegister(m), type, imm3, imm2, ir.GetCFlag()); + const auto result = ir.AddWithCarry(ir.GetRegister(n), shifted.result, ir.GetCFlag()); + ir.SetRegister(d, result.result); + if (S) { + ir.SetNFlag(ir.MostSignificantBit(result.result)); + ir.SetZFlag(ir.IsZero(result.result)); + ir.SetCFlag(result.carry); + ir.SetVFlag(result.overflow); + } + 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 1a025b7d..efb073bf 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -184,6 +184,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_PKH(Reg n, Imm<3> imm3, Reg d, Imm<2> imm2, Imm<1> tb, Reg m); bool thumb32_CMN_reg(Reg n, Imm<3> imm3, Imm<2> imm2, ShiftType type, Reg m); bool thumb32_ADD_reg(bool S, Reg n, Imm<3> imm3, Reg d, Imm<2> imm2, ShiftType type, Reg m); + bool thumb32_ADC_reg(bool S, Reg n, Imm<3> imm3, Reg d, Imm<2> imm2, ShiftType type, Reg m); // thumb32 data processing (modified immediate) instructions bool thumb32_TST_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8> imm8);