From 3dcc882fbf6a14e7a0240cd6a5cdd0a428ee2422 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Thu, 18 Feb 2021 01:12:52 +0000 Subject: [PATCH] thumb32: Implement BIC (immediate) --- src/frontend/A32/decoder/thumb32.inc | 2 +- ...umb32_data_processing_modified_immediate.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 74365811..8f5e082f 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -55,7 +55,7 @@ // Data Processing (Modified Immediate) INST(thumb32_TST_imm, "TST (imm)", "11110v000001nnnn0vvv1111vvvvvvvv") INST(thumb32_AND_imm, "AND (imm)", "11110v00000Snnnn0vvvddddvvvvvvvv") -//INST(thumb32_BIC_imm, "BIC (imm)", "11110-00001-----0---------------") +INST(thumb32_BIC_imm, "BIC (imm)", "11110v00001Snnnn0vvvddddvvvvvvvv") //INST(thumb32_MOV_imm, "MOV (imm)", "11110000010-11110---------------") //INST(thumb32_ORR_imm, "ORR (imm)", "11110-00010-----0---------------") //INST(thumb32_MVN_imm, "MVN (imm)", "11110000011-11110---------------") 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 bed028ea..f1e3657e 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 @@ -39,4 +39,21 @@ bool ThumbTranslatorVisitor::thumb32_AND_imm(Imm<1> i, bool S, Reg n, Imm<3> imm return true; } +bool ThumbTranslatorVisitor::thumb32_BIC_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 imm_carry = ThumbExpandImm_C(i, imm3, imm8, ir.GetCFlag()); + const auto result = ir.And(ir.GetRegister(n), ir.Not(ir.Imm32(imm_carry.imm32))); + + ir.SetRegister(d, result); + if (S) { + ir.SetNFlag(ir.MostSignificantBit(result)); + ir.SetZFlag(ir.IsZero(result)); + ir.SetCFlag(imm_carry.carry); + } + 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 9859b68b..2350d548 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -151,6 +151,7 @@ struct ThumbTranslatorVisitor final { // thumb32 data processing (modified immediate) instructions bool thumb32_TST_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8> imm8); bool thumb32_AND_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); + bool thumb32_BIC_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); // thumb32 miscellaneous control instructions bool thumb32_UDF();