target-arm: fix UMAAL instruction
PATCH v2 1/1 target-arm: fix UMAAL instruction
UMAAL should use unsigned multiply instead of signed.
This patch fixes this issue by handling UMAAL separately from UMULL/UMLAL/SMULL/SMLAL as these instructions are different enough. It also explicitly list instructions in case and catch nonexistent instruction as illegal. Also fixes a few style issues.
This fixes the issues reported in
https://bugs.launchpad.net/qemu/+bug/696015
--- target-arm/translate.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-)
target-arm/translate.c +22 -10
@@ -6637,26 +6637,38 @@ static void disas_arm_insn(CPUState * env, DisasContext *s)gen_logic_CC (tmp);store_reg (s, rd, tmp);break ; -default : -/* 64 bit mul */ +case 4 : +/* 64 bit mul double accumulate (UMAAL) */ +ARCH (6 ); tmp =load_reg (s, rs); tmp2 =load_reg (s, rm); -if (insn & (1 <<22 )) + tmp64 =gen_mulu_i64_i32 (tmp, tmp2); +gen_addq_lo (s, tmp64, rn); +gen_addq_lo (s, tmp64, rd); +gen_storeq_reg (s, rn, rd, tmp64); +tcg_temp_free_i64 (tmp64); +break ; +case 8 :case 9 :case 10 :case 11 : +case 12 :case 13 :case 14 :case 15 : +/* 64 bit mul: UMULL, UMLAL, SMULL, SMLAL. */ + tmp =load_reg (s, rs); + tmp2 =load_reg (s, rm); +if (insn & (1 <<22 )) { tmp64 =gen_muls_i64_i32 (tmp, tmp2); -else + }else { tmp64 =gen_mulu_i64_i32 (tmp, tmp2); -if (insn & (1 <<21 ))/* mult accumulate */ + } +if (insn & (1 <<21 )) {/* mult accumulate */ gen_addq (s, tmp64, rn, rd); -if (!(insn & (1 <<23 ))) {/* double accumulate */ -ARCH (6 ); -gen_addq_lo (s, tmp64, rn); -gen_addq_lo (s, tmp64, rd); } -if (insn & (1 <<20 )) +if (insn & (1 <<20 )) {gen_logicq_cc (tmp64); + }gen_storeq_reg (s, rn, rd, tmp64);tcg_temp_free_i64 (tmp64);break ; +default : + goto illegal_op; } }else { rn = (insn >>16 ) &0xf ;
Signature · 1 line
1.7.2.3
Quoted 7 lines · Aurelien Jarno
UMAAL should use unsigned multiply instead of signed.
This patch fixes this issue by handling UMAAL separately from UMULL/UMLAL/SMULL/SMLAL as these instructions are different enough. It also explicitly list instructions in case and catch nonexistent instruction as illegal. Also fixes a few style issues.
Quoted 5 lines
This fixes the issues reported in
https://bugs.launchpad.net/qemu/+bug/696015Cc Peter Maydell <[email protected]>Signed-off-by Aurelien Jarno <[email protected]>
Thanks for the tweaks, looks good to me.
-- PMM
Quoted 11 lines · Peter Maydell
Quoted 10 lines · Aurelien Jarno
UMAAL should use unsigned multiply instead of signed.
This patch fixes this issue by handling UMAAL separately from UMULL/UMLAL/SMULL/SMLAL as these instructions are different enough. It also explicitly list instructions in case and catch nonexistent instruction as illegal. Also fixes a few style issues.
This fixes the issues reported in
https://bugs.launchpad.net/qemu/+bug/696015
Quoted 7 lines
Quoted 2 lines
Cc Peter Maydell <[email protected]>Signed-off-by Aurelien Jarno <[email protected]>Thanks for the tweaks, looks good to me.
Reviewed-by Peter Maydell <[email protected]>
Thanks for the review, committed.
Signature · 2 lines
Aurelien Jarno GPG: 1024D/F1BCDB73 [email protected] http://www.aurel32.net