From 3cefdc3ab9a7785a336cb8ef1b6955bf9370babf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 10 Feb 2021 16:16:34 -0500 Subject: [PATCH] thumb32: Implement UXTAB16 --- src/frontend/A32/decoder/thumb32.inc | 2 +- .../impl/thumb32_data_processing_register.cpp | 14 ++++++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index dbc92aaa..fb17c5e3 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -202,7 +202,7 @@ INST(thumb32_UXTAH, "UXTAH", "111110100001nnnn1111dd INST(thumb32_SXTB16, "SXTB16", "11111010001011111111dddd10rrmmmm") INST(thumb32_SXTAB16, "SXTAB16", "111110100010nnnn1111dddd10rrmmmm") INST(thumb32_UXTB16, "UXTB16", "11111010001111111111dddd10rrmmmm") -//INST(thumb32_UXTAB16, "UXTAB16", "111110100011----1111----1-------") +INST(thumb32_UXTAB16, "UXTAB16", "111110100011nnnn1111dddd10rrmmmm") //INST(thumb32_SXTB, "SXTB", "11111010010011111111----1-------") //INST(thumb32_SXTAB, "SXTAB", "111110100100----1111----1-------") //INST(thumb32_UXTB, "UXTB", "11111010010111111111----1-------") diff --git a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp index 48478ad9..bfab403b 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp +++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp @@ -77,6 +77,20 @@ bool ThumbTranslatorVisitor::thumb32_UXTB16(Reg d, SignExtendRotation rotate, Re return true; } +bool ThumbTranslatorVisitor::thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m) { + if (d == Reg::PC || m == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto rotated = Rotate(ir, m, rotate); + auto result = ir.And(rotated, ir.Imm32(0x00FF00FF)); + const auto reg_n = ir.GetRegister(n); + result = ir.PackedAddU16(reg_n, result).result; + + ir.SetRegister(d, result); + return true; +} + bool ThumbTranslatorVisitor::thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m) { if (d == 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 ce205f98..6ac684d8 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -127,6 +127,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_SXTH(Reg d, SignExtendRotation rotate, Reg m); bool thumb32_SXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m); bool thumb32_UXTB16(Reg d, SignExtendRotation rotate, Reg m); + bool thumb32_UXTAB16(Reg n, Reg d, SignExtendRotation rotate, Reg m); bool thumb32_UXTH(Reg d, SignExtendRotation rotate, Reg m); bool thumb32_UXTAH(Reg n, Reg d, SignExtendRotation rotate, Reg m);