Refactor the handling of VQDMULL so that it is dealt with in its own if() case rather than together with the accumulating instructions.
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- target-arm/translate.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/target-arm/translate.c b/target-arm/translate.c index 3087a5d..cf5c3f0 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -5129,16 +5129,16 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) default: /* 15 is RESERVED. */ return 1; } - if (op == 5 || op == 13 || (op >= 8 && op <= 11)) { + if (op == 13) { + /* VQDMULL */ + gen_neon_addl_saturate(cpu_V0, cpu_V0, size); + neon_store_reg64(cpu_V0, rd + pass); + } else if (op == 5 || (op >= 8 && op <= 11)) { /* Accumulate. */ if (op == 10 || op == 11) { gen_neon_negl(cpu_V0, size); } - - if (op != 13) { - neon_load_reg64(cpu_V1, rd + pass); - } - + neon_load_reg64(cpu_V1, rd + pass); switch (op) { case 5: case 8: case 10: /* VABAL, VMLAL, VMLSL */ gen_neon_addl(size); @@ -5147,10 +5147,6 @@ static int disas_neon_data_insn(CPUState * env, DisasContext *s, uint32_t insn) gen_neon_addl_saturate(cpu_V0, cpu_V0, size); gen_neon_addl_saturate(cpu_V0, cpu_V1, size); break; - /* Fall through. */ - case 13: /* VQDMULL */ - gen_neon_addl_saturate(cpu_V0, cpu_V0, size); - break; default: abort(); } -- 1.7.1