diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index ea6f92e8..3b58d50e 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -263,7 +263,7 @@ INST(thumb32_CLZ, "CLZ", "111110101011nnnn1111dd // Multiply, Multiply Accumulate, and Absolute Difference INST(thumb32_MUL, "MUL", "111110110000nnnn1111dddd0000mmmm") INST(thumb32_MLA, "MLA", "111110110000nnnnaaaadddd0000mmmm") -//INST(thumb32_MLS, "MLS", "111110110000------------0001----") +INST(thumb32_MLS, "MLS", "111110110000nnnnaaaadddd0001mmmm") //INST(thumb32_SMULXY, "SMULXY", "111110110001----1111----00------") //INST(thumb32_SMLAXY, "SMLAXY", "111110110001------------00------") //INST(thumb32_SMUAD, "SMUAD", "111110110010----1111----000-----") diff --git a/src/frontend/A32/translate/impl/thumb32_multiply.cpp b/src/frontend/A32/translate/impl/thumb32_multiply.cpp index f8f32883..51daa8fd 100644 --- a/src/frontend/A32/translate/impl/thumb32_multiply.cpp +++ b/src/frontend/A32/translate/impl/thumb32_multiply.cpp @@ -21,6 +21,20 @@ bool ThumbTranslatorVisitor::thumb32_MLA(Reg n, Reg a, Reg d, Reg m) { return true; } +bool ThumbTranslatorVisitor::thumb32_MLS(Reg n, Reg a, Reg d, Reg m) { + if (d == Reg::PC || n == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto reg_a = ir.GetRegister(a); + const auto reg_m = ir.GetRegister(m); + const auto reg_n = ir.GetRegister(n); + const auto result = ir.Sub(reg_a, ir.Mul(reg_n, reg_m)); + + ir.SetRegister(d, result); + return true; +} + bool ThumbTranslatorVisitor::thumb32_MUL(Reg n, Reg d, Reg m) { if (d == Reg::PC || n == Reg::PC || m == Reg::PC) { return UnpredictableInstruction(); diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h index 2f39924c..e1cd29b6 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -130,6 +130,7 @@ struct ThumbTranslatorVisitor final { // thumb32 multiply instructions bool thumb32_MLA(Reg n, Reg a, Reg d, Reg m); + bool thumb32_MLS(Reg n, Reg a, Reg d, Reg m); bool thumb32_MUL(Reg n, Reg d, Reg m); // thumb32 parallel add/sub instructions