From fdd379a36ce116c510c1853dda6558ed4005f435 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 23 Feb 2021 04:37:31 -0500 Subject: [PATCH] thumb32: Implement LSL (register) --- src/frontend/A32/decoder/thumb32.inc | 2 +- .../impl/thumb32_data_processing_register.cpp | 13 +++++++++++++ src/frontend/A32/translate/impl/translate_thumb.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/frontend/A32/decoder/thumb32.inc b/src/frontend/A32/decoder/thumb32.inc index 71e3e4ef..07354644 100644 --- a/src/frontend/A32/decoder/thumb32.inc +++ b/src/frontend/A32/decoder/thumb32.inc @@ -189,7 +189,7 @@ INST(thumb32_BLX_imm, "BLX (imm)", "11110Svvvvvvvvvv11j0jv //INST(thumb32_LDR_imm12, "LDR (imm12)", "111110001101--------------------") // Data Processing (register) -//INST(thumb32_LSL_reg, "LSL (reg)", "11111010000-----1111----0000----") +INST(thumb32_LSL_reg, "LSL (reg)", "111110100000mmmm1111dddd0000ssss") //INST(thumb32_LSR_reg, "LSR (reg)", "11111010001-----1111----0000----") //INST(thumb32_ASR_reg, "ASR (reg)", "11111010010-----1111----0000----") //INST(thumb32_ROR_reg, "ROR (reg)", "11111010011-----1111----0000----") 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 cf6bbf7b..ecd71197 100644 --- a/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp +++ b/src/frontend/A32/translate/impl/thumb32_data_processing_register.cpp @@ -11,6 +11,19 @@ static IR::U32 Rotate(A32::IREmitter& ir, Reg m, SignExtendRotation rotate) { return ir.RotateRight(ir.GetRegister(m), ir.Imm8(rotate_by), ir.Imm1(0)).result; } +bool ThumbTranslatorVisitor::thumb32_LSL_reg(Reg m, Reg d, Reg s) { + if (d == Reg::PC || m == Reg::PC || s == Reg::PC) { + return UnpredictableInstruction(); + } + + const auto shift_s = ir.LeastSignificantByte(ir.GetRegister(s)); + const auto apsr_c = ir.GetCFlag(); + const auto result_carry = ir.LogicalShiftLeft(ir.GetRegister(m), shift_s, apsr_c); + + ir.SetRegister(d, result_carry.result); + return true; +} + bool ThumbTranslatorVisitor::thumb32_SXTB(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 5ffecd9d..388abca8 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -182,6 +182,7 @@ struct ThumbTranslatorVisitor final { bool thumb32_BLX_imm(Imm<1> S, Imm<10> hi, Imm<1> j1, Imm<1> j2, Imm<11> lo); // thumb32 data processing (register) instructions + bool thumb32_LSL_reg(Reg m, Reg d, Reg s); bool thumb32_SXTB(Reg d, SignExtendRotation rotate, Reg m); bool thumb32_SXTB16(Reg d, SignExtendRotation rotate, Reg m); bool thumb32_SXTAB(Reg n, Reg d, SignExtendRotation rotate, Reg m);