From 8d33de2dcced93ddea6d936af7bb36299eee2a20 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sun, 28 Feb 2021 21:45:27 +0000 Subject: [PATCH] thumb32: Implement SUB (immediate, T3) --- src/frontend/A32/decoder/thumb32.inc | 2 +- ...b32_data_processing_modified_immediate.cpp | 19 +++++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index d8ce6862..fbad47f5 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -67,7 +67,7 @@ INST(thumb32_ADD_imm_1, "ADD (imm)", "11110v01000Snnnn0vvvdd INST(thumb32_ADC_imm, "ADC (imm)", "11110v01010Snnnn0vvvddddvvvvvvvv") INST(thumb32_SBC_imm, "SBC (imm)", "11110v01011Snnnn0vvvddddvvvvvvvv") INST(thumb32_CMP_imm, "CMP (imm)", "11110v011011nnnn0vvv1111vvvvvvvv") -//INST(thumb32_SUB_imm_1, "SUB (imm)", "11110-01101-----0---------------") +INST(thumb32_SUB_imm_1, "SUB (imm)", "11110v01101Snnnn0vvvddddvvvvvvvv") //INST(thumb32_RSB_imm, "RSB (imm)", "11110-01110-----0---------------") // Data Processing (Plain Binary Immediate) 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 0d07f7a6..a99b2c3a 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 @@ -243,4 +243,23 @@ bool ThumbTranslatorVisitor::thumb32_CMP_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8 return true; } +bool ThumbTranslatorVisitor::thumb32_SUB_imm_1(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8) { + ASSERT_MSG(!(d == Reg::PC && S), "Decode error"); + if ((d == Reg::PC && !S) || n == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto imm32 = ThumbExpandImm(i, imm3, imm8); + const auto result = ir.SubWithCarry(ir.GetRegister(n), ir.Imm32(imm32), ir.Imm1(1)); + + 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 ad9466ef..fdece1df 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -163,6 +163,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_ADC_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); bool thumb32_SBC_imm(Imm<1> i, bool S, Reg n, Imm<3> imm3, Reg d, Imm<8> imm8); bool thumb32_CMP_imm(Imm<1> i, Reg n, Imm<3> imm3, Imm<8> imm8); + bool thumb32_SUB_imm_1(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);