diff --git a/qemu/target/arm/translate.c b/qemu/target/arm/translate.c
index 4358caa9..acb9c35f 100644
--- a/qemu/target/arm/translate.c
+++ b/qemu/target/arm/translate.c
@@ -4315,8 +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_VCVTAU && op <= NEON_2RM_VCVTMS) ||
-            op >= NEON_2RM_VRECPE_F);
+    return op >= NEON_2RM_VRECPE_F;
 }
 
 static bool neon_2rm_is_v8_op(int op)
@@ -6955,10 +6954,10 @@ static int disas_neon_data_insn(DisasContext *s, uint32_t insn)
                                                       tcg_ctx->cpu_env);
 
                             if (is_signed) {
-                                gen_helper_vfp_tosls(tcg_ctx, s->F0s, s->F0s,
+                                gen_helper_vfp_tosls(tcg_ctx, tmp, tmp,
                                                      tcg_shift, fpst);
                             } else {
-                                gen_helper_vfp_touls(tcg_ctx, s->F0s, s->F0s,
+                                gen_helper_vfp_touls(tcg_ctx, tmp, tmp,
                                                      tcg_shift, fpst);
                             }