From e6b925146bed031c120a10a3bf95e73e30347abd Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sun, 28 Feb 2021 21:41:08 +0000 Subject: [PATCH] thumb32: Implement ADC (immediate) --- src/frontend/A32/decoder/thumb32.inc | 2 +- ...mb32_data_processing_modified_immediate.cpp | 18 ++++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index 8ca26531..a4cbc0ea 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -64,7 +64,7 @@ INST(thumb32_TEQ_imm, "TEQ (imm)", "11110v001001nnnn0vvv11 INST(thumb32_EOR_imm, "EOR (imm)", "11110v00100Snnnn0vvvddddvvvvvvvv") INST(thumb32_CMN_imm, "CMN (imm)", "11110v010001nnnn0vvv1111vvvvvvvv") INST(thumb32_ADD_imm_1, "ADD (imm)", "11110v01000Snnnn0vvvddddvvvvvvvv") -//INST(thumb32_ADC_imm, "ADC (imm)", "11110-01010-----0---------------") +INST(thumb32_ADC_imm, "ADC (imm)", "11110v01010Snnnn0vvvddddvvvvvvvv") //INST(thumb32_SBC_imm, "SBC (imm)", "11110-01011-----0---------------") //INST(thumb32_CMP_imm, "CMP (imm)", "11110-011011----0---1111--------") //INST(thumb32_SUB_imm_1, "SUB (imm)", "11110-01101-----0---------------") diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp index cd9ef2b3..a6c598d0 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp +++ b/src/frontend/A32/translate/impl/thumb32_data_processing_modified_immediate.cpp @@ -192,4 +192,22 @@ bool ThumbTranslatorVisitor::thumb32_ADD_imm_1(Imm<1> i, bool S, Reg n, Imm<3> i return true; } +bool ThumbTranslatorVisitor::thumb32_ADC_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8) { + if (d == Reg::PC || n == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto imm32 = ThumbExpandImm(i, imm3, imm8); + const auto result = ir.AddWithCarry(ir.GetRegister(n), ir.Imm32(imm32), 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 7b3269fa..db707499 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -160,6 +160,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_EOR_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); bool thumb32_CMN_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8> imm8); bool thumb32_ADD_imm_1(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); + bool thumb32_ADC_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); // thumb32 data processing (plain binary immediate) instructions. bool thumb32_MOVT(Imm<1> imm1, Imm<4> imm4, Imm<3> imm3, Reg d, Imm<8> imm8);