target-arm: Add support for PKHxx in thumb2
PATCH 1/2 target-arm: Add support for PKHxx in thumb2
The PKHxx instructions were not recognized by the thumb2 decoder. The solution provided in this changeset is identical to the arm-mode implementation.
Signed-off-by Johan Bengtsson <[email protected]>
--- target-arm/translate.c | 63 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 45 insertions(+), 18 deletions(-)
target-arm/translate.c +45 -18
@@ -7601,27 +7601,54 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1) } }break ; -case 5 :/* Data processing register constant shift. */ -if (rn ==15 ) { - tmp =new_tmp (); -tcg_gen_movi_i32 (tmp,0 ); - }else { - tmp =load_reg (s, rn); - } - tmp2 =load_reg (s, rm); +case 5 : + op = (insn >>21 ) &0xf ; - shiftop = (insn >>4 ) &3 ; - shift = ((insn >>6 ) &3 ) | ((insn >>10 ) &0x1c ); - conds = (insn & (1 <<20 )) !=0 ; - logic_cc = (conds &&thumb2_logic_op (op)); -gen_arm_shift_im (tmp2, shiftop, shift, logic_cc); -if (gen_thumb2_data_op (s, op, conds,0 , tmp, tmp2)) - goto illegal_op; -dead_tmp (tmp2); -if (rd !=15 ) { +if (op ==6 ) { +/* Halfword pack. */ + tmp =load_reg (s, rn); + tmp2 =load_reg (s, rm); + shift = ((insn >>10 ) &0x1c ) | ((insn >>6 ) &0x3 ); +if (insn & (1 <<5 )) { +/* pkhtb */ +if (shift ==0 ) + shift =31 ; +tcg_gen_sari_i32 (tmp2, tmp2, shift); +tcg_gen_andi_i32 (tmp, tmp,0xffff0000 ); +tcg_gen_ext16u_i32 (tmp2, tmp2); + }else { +/* pkhbt */ +if (shift) +tcg_gen_shli_i32 (tmp2, tmp2, shift); +tcg_gen_ext16u_i32 (tmp, tmp); +tcg_gen_andi_i32 (tmp2, tmp2,0xffff0000 ); + } +tcg_gen_or_i32 (tmp, tmp, tmp2); +dead_tmp (tmp2);store_reg (s, rd, tmp); }else { -dead_tmp (tmp); +/* Data processing register constant shift. */ +if (rn ==15 ) { + tmp =new_tmp (); +tcg_gen_movi_i32 (tmp,0 ); + }else { + tmp =load_reg (s, rn); + } + tmp2 =load_reg (s, rm); + + shiftop = (insn >>4 ) &3 ; + shift = ((insn >>6 ) &3 ) | ((insn >>10 ) &0x1c ); + conds = (insn & (1 <<20 )) !=0 ; + logic_cc = (conds &&thumb2_logic_op (op)); +gen_arm_shift_im (tmp2, shiftop, shift, logic_cc); +if (gen_thumb2_data_op (s, op, conds,0 , tmp, tmp2)) + goto illegal_op; +dead_tmp (tmp2); +if (rd !=15 ) { +store_reg (s, rd, tmp); + }else { +dead_tmp (tmp); + } }break ;case 13 :/* Misc data processing. */
Signature · 1 line
1.7.0.4
PATCH 2/2 target-arm: Fix mixup in decoding of saturating add and sub
The thumb2 decoder contained a mixup between the bit controlling doubling and the bit controlling if the operation was an add or a sub.
Signed-off-by Johan Bengtsson <[email protected]>
--- target-arm/translate.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
target-arm/translate.c +2 -2
@@ -7713,9 +7713,9 @@ static int disas_thumb2_insn(CPUState *env, DisasContext *s, uint16_t insn_hw1)/* Saturating add/subtract. */ tmp =load_reg (s, rn); tmp2 =load_reg (s, rm); -if (op &2 ) -gen_helper_double_saturate (tmp, tmp);if (op &1 ) +gen_helper_double_saturate (tmp, tmp); +if (op &2 )gen_helper_sub_saturate (tmp, tmp2, tmp);else gen_helper_add_saturate (tmp, tmp, tmp2);
Signature · 1 line
1.7.0.4