From fb1405157b4f3e727b52e96028673b6438a275a8 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 7 Feb 2021 17:45:00 -0500 Subject: [PATCH] thumb32: Implement UMAAL --- src/frontend/A32/decoder/thumb32.inc | 2 +- .../translate/impl/thumb32_long_multiply.cpp | 20 +++++++++++++++++++ .../A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index d986d088..7b049dde 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -288,7 +288,7 @@ INST(thumb32_SMLALXY, "SMLALXY", "111110111100nnnnllllhh INST(thumb32_SMLALD, "SMLALD", "111110111100nnnnllllhhhh110Mmmmm") INST(thumb32_SMLSLD, "SMLSLD", "111110111101nnnnllllhhhh110Mmmmm") INST(thumb32_UMLAL, "UMLAL", "111110111110nnnnllllhhhh0000mmmm") -//INST(thumb32_UMAAL, "UMAAL", "111110111110------------0110----") +INST(thumb32_UMAAL, "UMAAL", "111110111110nnnnllllhhhh0110mmmm") // Coprocessor //INST(thumb32_MCRR2, "MCRR2", "111111000100--------------------") diff --git a/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp b/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp index 7bf0fe91..82ef1f13 100644 --- a/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp +++ b/src/frontend/A32/translate/impl/thumb32_long_multiply.cpp @@ -175,4 +175,24 @@ bool ThumbTranslatorVisitor::thumb32_UMULL(Reg n, Reg dLo, Reg dHi, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_UMAAL(Reg n, Reg dLo, Reg dHi, Reg m) { + if (dLo == Reg::PC || dHi == Reg::PC || n == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + if (dHi == dLo) { + return UnpredictableInstruction(); + } + + const auto lo64 = ir.ZeroExtendWordToLong(ir.GetRegister(dLo)); + const auto hi64 = ir.ZeroExtendWordToLong(ir.GetRegister(dHi)); + const auto n64 = ir.ZeroExtendWordToLong(ir.GetRegister(n)); + const auto m64 = ir.ZeroExtendWordToLong(ir.GetRegister(m)); + const auto result = ir.Add(ir.Add(ir.Mul(n64, m64), hi64), lo64); + + ir.SetRegister(dLo, ir.LeastSignificantWord(result)); + ir.SetRegister(dHi, ir.MostSignificantWord(result).result); + 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 de0898d9..008beaf6 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -122,6 +122,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_SMLALXY(Reg n, Reg dLo, Reg dHi, bool N, bool M, Reg m); bool thumb32_SMLSLD(Reg n, Reg dLo, Reg dHi, bool M, Reg m); bool thumb32_SMULL(Reg n, Reg dLo, Reg dHi, Reg m); + bool thumb32_UMAAL(Reg n, Reg dLo, Reg dHi, Reg m); bool thumb32_UMLAL(Reg n, Reg dLo, Reg dHi, Reg m); bool thumb32_UMULL(Reg n, Reg dLo, Reg dHi, Reg m);