SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Pass fpstatus to vfp_sqrt*

Browse Source 
Pass fpstatus not env, like most other fp helpers.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20241211163036.2297116-26-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2024-12-11 10:29:52 -06:00 committed by Peter Maydell
parent 5ee3c6c8fd
commit cf866d81b8
4 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/arm/helper.h
View File

@ -133,9 +133,9 @@ DEF_HELPER_3(vfp_maxnumd, f64, f64, f64, ptr)
DEF_HELPER_3(vfp_minnumh, f16, f16, f16, ptr) DEF_HELPER_3(vfp_minnumh, f16, f16, f16, ptr)
DEF_HELPER_3(vfp_minnums, f32, f32, f32, ptr) DEF_HELPER_3(vfp_minnums, f32, f32, f32, ptr)
DEF_HELPER_3(vfp_minnumd, f64, f64, f64, ptr) DEF_HELPER_3(vfp_minnumd, f64, f64, f64, ptr)
DEF_HELPER_2(vfp_sqrth, f16, f16, env) DEF_HELPER_2(vfp_sqrth, f16, f16, ptr)
DEF_HELPER_2(vfp_sqrts, f32, f32, env) DEF_HELPER_2(vfp_sqrts, f32, f32, ptr)
DEF_HELPER_2(vfp_sqrtd, f64, f64, env) DEF_HELPER_2(vfp_sqrtd, f64, f64, ptr)
DEF_HELPER_3(vfp_cmph, void, f16, f16, env) DEF_HELPER_3(vfp_cmph, void, f16, f16, env)
DEF_HELPER_3(vfp_cmps, void, f32, f32, env) DEF_HELPER_3(vfp_cmps, void, f32, f32, env)
DEF_HELPER_3(vfp_cmpd, void, f64, f64, env) DEF_HELPER_3(vfp_cmpd, void, f64, f64, env)

15
target/arm/tcg/translate-a64.c
View File

@ -8401,8 +8401,8 @@ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn)
switch (opcode) { switch (opcode) {
case 0x3: /* FSQRT */ case 0x3: /* FSQRT */
gen_helper_vfp_sqrts(tcg_res, tcg_op, tcg_env); gen_fpst = gen_helper_vfp_sqrts;
goto done; break;
case 0x6: /* BFCVT */ case 0x6: /* BFCVT */
gen_fpst = gen_helper_bfcvt; gen_fpst = gen_helper_bfcvt;
break; break;
@ -8450,7 +8450,6 @@ static void handle_fp_1src_single(DisasContext *s, int opcode, int rd, int rn)
gen_fpst(tcg_res, tcg_op, fpst); gen_fpst(tcg_res, tcg_op, fpst);
} }
done:
write_fp_sreg(s, rd, tcg_res); write_fp_sreg(s, rd, tcg_res);
} }
@ -8467,8 +8466,8 @@ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn)
switch (opcode) { switch (opcode) {
case 0x3: /* FSQRT */ case 0x3: /* FSQRT */
gen_helper_vfp_sqrtd(tcg_res, tcg_op, tcg_env); gen_fpst = gen_helper_vfp_sqrtd;
goto done; break;
case 0x8: /* FRINTN */ case 0x8: /* FRINTN */
case 0x9: /* FRINTP */ case 0x9: /* FRINTP */
case 0xa: /* FRINTM */ case 0xa: /* FRINTM */
@ -8513,7 +8512,6 @@ static void handle_fp_1src_double(DisasContext *s, int opcode, int rd, int rn)
gen_fpst(tcg_res, tcg_op, fpst); gen_fpst(tcg_res, tcg_op, fpst);
} }
done:
write_fp_dreg(s, rd, tcg_res); write_fp_dreg(s, rd, tcg_res);
} }
@ -9459,7 +9457,7 @@ static void handle_2misc_64(DisasContext *s, int opcode, bool u,
gen_vfp_negd(tcg_rd, tcg_rn); gen_vfp_negd(tcg_rd, tcg_rn);
break; break;
case 0x7f: /* FSQRT */ case 0x7f: /* FSQRT */
gen_helper_vfp_sqrtd(tcg_rd, tcg_rn, tcg_env); gen_helper_vfp_sqrtd(tcg_rd, tcg_rn, tcg_fpstatus);
break; break;
case 0x1a: /* FCVTNS */ case 0x1a: /* FCVTNS */
case 0x1b: /* FCVTMS */ case 0x1b: /* FCVTMS */
@ -10402,6 +10400,7 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn)
handle_2misc_fcmp_zero(s, opcode, false, u, is_q, size, rn, rd); handle_2misc_fcmp_zero(s, opcode, false, u, is_q, size, rn, rd);
return; return;
case 0x7f: /* FSQRT */ case 0x7f: /* FSQRT */
need_fpstatus = true;
if (size == 3 && !is_q) { if (size == 3 && !is_q) {
unallocated_encoding(s); unallocated_encoding(s);
return; return;
@ -10631,7 +10630,7 @@ static void disas_simd_two_reg_misc(DisasContext *s, uint32_t insn)
gen_vfp_negs(tcg_res, tcg_op); gen_vfp_negs(tcg_res, tcg_op);
break; break;
case 0x7f: /* FSQRT */ case 0x7f: /* FSQRT */
gen_helper_vfp_sqrts(tcg_res, tcg_op, tcg_env); gen_helper_vfp_sqrts(tcg_res, tcg_op, tcg_fpstatus);
break; break;
case 0x1a: /* FCVTNS */ case 0x1a: /* FCVTNS */
case 0x1b: /* FCVTMS */ case 0x1b: /* FCVTMS */

6
target/arm/tcg/translate-vfp.c
View File

@ -2424,17 +2424,17 @@ DO_VFP_2OP(VNEG, dp, gen_vfp_negd, aa32_fpdp_v2)
static void gen_VSQRT_hp(TCGv_i32 vd, TCGv_i32 vm) static void gen_VSQRT_hp(TCGv_i32 vd, TCGv_i32 vm)
{ {
gen_helper_vfp_sqrth(vd, vm, tcg_env); gen_helper_vfp_sqrth(vd, vm, fpstatus_ptr(FPST_FPCR_F16));
} }
static void gen_VSQRT_sp(TCGv_i32 vd, TCGv_i32 vm) static void gen_VSQRT_sp(TCGv_i32 vd, TCGv_i32 vm)
{ {
gen_helper_vfp_sqrts(vd, vm, tcg_env); gen_helper_vfp_sqrts(vd, vm, fpstatus_ptr(FPST_FPCR));
} }
static void gen_VSQRT_dp(TCGv_i64 vd, TCGv_i64 vm) static void gen_VSQRT_dp(TCGv_i64 vd, TCGv_i64 vm)
{ {
gen_helper_vfp_sqrtd(vd, vm, tcg_env); gen_helper_vfp_sqrtd(vd, vm, fpstatus_ptr(FPST_FPCR));
} }
DO_VFP_2OP(VSQRT, hp, gen_VSQRT_hp, aa32_fp16_arith) DO_VFP_2OP(VSQRT, hp, gen_VSQRT_hp, aa32_fp16_arith)

12
target/arm/vfp_helper.c
View File

@ -314,19 +314,19 @@ VFP_BINOP(minnum)
VFP_BINOP(maxnum) VFP_BINOP(maxnum)
#undef VFP_BINOP #undef VFP_BINOP
dh_ctype_f16 VFP_HELPER(sqrt, h)(dh_ctype_f16 a, CPUARMState *env) dh_ctype_f16 VFP_HELPER(sqrt, h)(dh_ctype_f16 a, void *fpstp)
{ {
return float16_sqrt(a, &env->vfp.fp_status_f16); return float16_sqrt(a, fpstp);
} }
float32 VFP_HELPER(sqrt, s)(float32 a, CPUARMState *env) float32 VFP_HELPER(sqrt, s)(float32 a, void *fpstp)
{ {
return float32_sqrt(a, &env->vfp.fp_status); return float32_sqrt(a, fpstp);
} }
float64 VFP_HELPER(sqrt, d)(float64 a, CPUARMState *env) float64 VFP_HELPER(sqrt, d)(float64 a, void *fpstp)
{ {
return float64_sqrt(a, &env->vfp.fp_status); return float64_sqrt(a, fpstp);
} }
static void softfloat_to_vfp_compare(CPUARMState *env, FloatRelation cmp) static void softfloat_to_vfp_compare(CPUARMState *env, FloatRelation cmp)