Commit 58f2682e authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: stop using deprecated functions in NEON_2RM_VCVT_F16_F32 



Remove some old constructs from NEON_2RM_VCVT_F16_F32 code:
 * don't use cpu_F0s
 * don't use tcg_gen_ld_f32

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190613163917.28589-11-peter.maydell@linaro.org
parent c253dd78

target/arm/translate.c

+12 −15
Original line number Diff line number Diff line
@@ -1542,7 +1542,6 @@ static TCGv_ptr vfp_reg_ptr(bool dp, int reg) 
    return ret;

}



#define tcg_gen_ld_f32 tcg_gen_ld_i32

#define tcg_gen_st_f32 tcg_gen_st_i32



#define ARM_CP_RW_BIT   (1 << 20)
@@ -6425,25 +6424,23 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn) 
                        q || (rm & 1)) {

                        return 1;

                    }

                    tmp = tcg_temp_new_i32();

                    tmp2 = tcg_temp_new_i32();

                    fpst = get_fpstatus_ptr(true);

                    ahp = get_ahp_flag();

                    tcg_gen_ld_f32(cpu_F0s, cpu_env, neon_reg_offset(rm, 0));

                    gen_helper_vfp_fcvt_f32_to_f16(tmp, cpu_F0s, fpst, ahp);

                    tcg_gen_ld_f32(cpu_F0s, cpu_env, neon_reg_offset(rm, 1));

                    gen_helper_vfp_fcvt_f32_to_f16(tmp2, cpu_F0s, fpst, ahp);

                    tmp = neon_load_reg(rm, 0);

                    gen_helper_vfp_fcvt_f32_to_f16(tmp, tmp, fpst, ahp);

                    tmp2 = neon_load_reg(rm, 1);

                    gen_helper_vfp_fcvt_f32_to_f16(tmp2, tmp2, fpst, ahp);

                    tcg_gen_shli_i32(tmp2, tmp2, 16);

                    tcg_gen_or_i32(tmp2, tmp2, tmp);

                    tcg_gen_ld_f32(cpu_F0s, cpu_env, neon_reg_offset(rm, 2));

                    gen_helper_vfp_fcvt_f32_to_f16(tmp, cpu_F0s, fpst, ahp);

                    tcg_gen_ld_f32(cpu_F0s, cpu_env, neon_reg_offset(rm, 3));

                    tcg_temp_free_i32(tmp);

                    tmp = neon_load_reg(rm, 2);

                    gen_helper_vfp_fcvt_f32_to_f16(tmp, tmp, fpst, ahp);

                    tmp3 = neon_load_reg(rm, 3);

                    neon_store_reg(rd, 0, tmp2);

                    tmp2 = tcg_temp_new_i32();

                    gen_helper_vfp_fcvt_f32_to_f16(tmp2, cpu_F0s, fpst, ahp);

                    tcg_gen_shli_i32(tmp2, tmp2, 16);

                    tcg_gen_or_i32(tmp2, tmp2, tmp);

                    neon_store_reg(rd, 1, tmp2);

                    gen_helper_vfp_fcvt_f32_to_f16(tmp3, tmp3, fpst, ahp);

                    tcg_gen_shli_i32(tmp3, tmp3, 16);

                    tcg_gen_or_i32(tmp3, tmp3, tmp);

                    neon_store_reg(rd, 1, tmp3);

                    tcg_temp_free_i32(tmp);

                    tcg_temp_free_i32(ahp);

                    tcg_temp_free_ptr(fpst);