target/arm: Stop using cpu_F0s for NEON_2RM_VRINT*

Switch NEON_2RM_VRINT* away from using cpu_F0s.

Backports commit 3b52ad1fae804acdc2fdc41b418a65249beae430 from qemu
This commit is contained in:
Peter Maydell 2019-06-25 18:26:22 -05:00 committed by Lioncash
parent a62cbc7ac5
commit 0d4535bf16
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -4315,9 +4315,7 @@ static int neon_2rm_is_float_op(int op)
* what we are asking here is "does the code for this case in * what we are asking here is "does the code for this case in
* the Neon for-each-pass loop use cpu_F0s?". * the Neon for-each-pass loop use cpu_F0s?".
*/ */
return ((op >= NEON_2RM_VRINTN && op <= NEON_2RM_VRINTZ) || return ((op >= NEON_2RM_VCVTAU && op <= NEON_2RM_VCVTMS) ||
op == NEON_2RM_VRINTM ||
(op >= NEON_2RM_VRINTP && op <= NEON_2RM_VCVTMS) ||
op >= NEON_2RM_VRECPE_F); op >= NEON_2RM_VRECPE_F);
} }
@ -6923,7 +6921,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn)
tcg_rmode = tcg_const_i32(tcg_ctx, arm_rmode_to_sf(rmode)); tcg_rmode = tcg_const_i32(tcg_ctx, arm_rmode_to_sf(rmode));
gen_helper_set_neon_rmode(tcg_ctx, tcg_rmode, tcg_rmode, gen_helper_set_neon_rmode(tcg_ctx, tcg_rmode, tcg_rmode,
tcg_ctx->cpu_env); tcg_ctx->cpu_env);
gen_helper_rints(tcg_ctx, s->F0s, s->F0s, fpstatus); gen_helper_rints(tcg_ctx, tmp, tmp, fpstatus);
gen_helper_set_neon_rmode(tcg_ctx, tcg_rmode, tcg_rmode, gen_helper_set_neon_rmode(tcg_ctx, tcg_rmode, tcg_rmode,
tcg_ctx->cpu_env); tcg_ctx->cpu_env);
tcg_temp_free_ptr(tcg_ctx, fpstatus); tcg_temp_free_ptr(tcg_ctx, fpstatus);
@ -6933,7 +6931,7 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn)
case NEON_2RM_VRINTX: case NEON_2RM_VRINTX:
{ {
TCGv_ptr fpstatus = get_fpstatus_ptr(s, 1); TCGv_ptr fpstatus = get_fpstatus_ptr(s, 1);
gen_helper_rints_exact(tcg_ctx, s->F0s, s->F0s, fpstatus); gen_helper_rints_exact(tcg_ctx, tmp, tmp, fpstatus);
tcg_temp_free_ptr(tcg_ctx, fpstatus); tcg_temp_free_ptr(tcg_ctx, fpstatus);
break; break;
} }