Message ID | 20180502221552.3873-14-richard.henderson@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | target/arm: Fixups for ARM_FEATURE_V8_FP16 | expand |
On 2 May 2018 at 23:15, Richard Henderson <richard.henderson@linaro.org> wrote: > From: Alex Bennée <alex.bennee@linaro.org> > > All the hard work is already done by vfp_expand_imm, we just need to > make sure we pick up the correct size. > > Cc: qemu-stable@nongnu.org > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > [rth: Merge unallocated_encoding check with TCGMemOp conversion.] > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1ea5185f14..b73d6d96cd 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -5437,11 +5437,25 @@ static void disas_fp_imm(DisasContext *s, uint32_t insn) { int rd = extract32(insn, 0, 5); int imm8 = extract32(insn, 13, 8); - int is_double = extract32(insn, 22, 2); + int type = extract32(insn, 22, 2); uint64_t imm; TCGv_i64 tcg_res; + TCGMemOp sz; - if (is_double > 1) { + switch (type) { + case 0: + sz = MO_32; + break; + case 1: + sz = MO_64; + break; + case 3: + sz = MO_16; + if (arm_dc_feature(s, ARM_FEATURE_V8_FP16)) { + break; + } + /* fallthru */ + default: unallocated_encoding(s); return; } @@ -5450,7 +5464,7 @@ static void disas_fp_imm(DisasContext *s, uint32_t insn) return; } - imm = vfp_expand_imm(MO_32 + is_double, imm8); + imm = vfp_expand_imm(sz, imm8); tcg_res = tcg_const_i64(imm); write_fp_dreg(s, rd, tcg_res);