diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index b29b691f..c4008486 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -13,8 +13,8 @@ INST(thumb32_LDMDB, "LDMDB/LDMEA", "1110100100W1nnnniiiiii // Load/Store Dual, Load/Store Exclusive, Table Branch //INST(thumb32_STREX, "STREX", "111010000100--------------------") //INST(thumb32_LDREX, "LDREX", "111010000101--------------------") -//INST(thumb32_STRD_imm_1, "STRD (imm)", "11101000-110--------------------") -//INST(thumb32_STRD_imm_2, "STRD (imm)", "11101001-1-0--------------------") +INST(thumb32_STRD_imm_1, "STRD (imm)", "11101000U110nnnnttttssssiiiiiiii") +INST(thumb32_STRD_imm_2, "STRD (imm)", "11101001U1W0nnnnttttssssiiiiiiii") //INST(thumb32_LDRD_imm_1, "LDRD (lit)", "11101000-1111111----------------") //INST(thumb32_LDRD_imm_2, "LDRD (lit)", "11101001-1-11111----------------") //INST(thumb32_LDRD_imm_1, "LDRD (imm)", "11101000-111--------------------") diff --git a/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp b/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp index 408def8a..86eeda5d 100644 --- a/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp +++ b/src/frontend/A32/translate/impl/thumb32_load_store_dual.cpp @@ -39,6 +39,42 @@ static bool TableBranch(ThumbTranslatorVisitor& v, Reg n, Reg m, bool half) { return false; } +static bool StoreDual(ThumbTranslatorVisitor& v, bool P, bool U, bool W, Reg n, Reg t, Reg t2, Imm<8> imm8) { + if (W && (n == t || n == t2)) { + return v.UnpredictableInstruction(); + } + if (n == Reg::PC || t == Reg::PC || t2 == Reg::PC) { + return v.UnpredictableInstruction(); + } + + const u32 imm = imm8.ZeroExtend() << 2; + const IR::U32 reg_n = v.ir.GetRegister(n); + const IR::U32 reg_t = v.ir.GetRegister(t); + const IR::U32 reg_t2 = v.ir.GetRegister(t2); + + const IR::U32 offset_address = U ? v.ir.Add(reg_n, v.ir.Imm32(imm)) + : v.ir.Sub(reg_n, v.ir.Imm32(imm)); + const IR::U32 address_1 = P ? offset_address + : reg_n; + const IR::U32 address_2 = v.ir.Add(address_1, v.ir.Imm32(4)); + + v.ir.WriteMemory32(address_1, reg_t); + v.ir.WriteMemory32(address_2, reg_t2); + + if (W) { + v.ir.SetRegister(n, offset_address); + } + return true; +} + +bool ThumbTranslatorVisitor::thumb32_STRD_imm_1(bool U, Reg n, Reg t, Reg t2, Imm<8> imm8) { + return StoreDual(*this, false, U, true, n, t, t2, imm8); +} + +bool ThumbTranslatorVisitor::thumb32_STRD_imm_2(bool U, bool W, Reg n, Reg t, Reg t2, Imm<8> imm8) { + return StoreDual(*this, true, U, W, n, t, t2, imm8); +} + bool ThumbTranslatorVisitor::thumb32_TBB(Reg n, Reg m) { return TableBranch(*this, n, m, false); } diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h index 0ddab7da..d456a19a 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -180,6 +180,8 @@ struct ThumbTranslatorVisitor final { bool thumb32_STMDB(bool W, Reg n, Imm<15> reg_list); // thumb32 load/store dual, load/store exclusive, table branch instructions + bool thumb32_STRD_imm_1(bool U, Reg n, Reg t, Reg t2, Imm<8> imm8); + bool thumb32_STRD_imm_2(bool U, bool W, Reg n, Reg t, Reg t2, Imm<8> imm8); bool thumb32_TBB(Reg n, Reg m); bool thumb32_TBH(Reg n, Reg m);