diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
index b42fa554..4358caa9 100644
--- a/qemu/target/arm/translate.c
+++ b/qemu/target/arm/translate.c
@@ -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
      * the Neon for-each-pass loop use cpu_F0s?".
      */
-    return ((op >= NEON_2RM_VRINTN && op <= NEON_2RM_VRINTZ) ||
-            op == NEON_2RM_VRINTM ||
-            (op >= NEON_2RM_VRINTP && op <= NEON_2RM_VCVTMS) ||
+    return ((op >= NEON_2RM_VCVTAU && op <= NEON_2RM_VCVTMS) ||
             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));
                             gen_helper_set_neon_rmode(tcg_ctx, tcg_rmode, tcg_rmode,
                                                       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,
                                                       tcg_ctx->cpu_env);
                             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:
                         {
                             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);
                             break;
                         }