[Qemu-devel] [PATCH 45/48] target-arm: fix neon vcvt fixed-point

[Riku Voipio]

From: Juha Riihimäki <address@hidden>

Signed-Off-By: Riku Voipio <address@hidden>
Signed-off-by: Juha Riihimäki <address@hidden>
---
 target-arm/translate.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/target-arm/translate.c b/target-arm/translate.c
index 92c8a1a..fd3a72e 100644
--- a/target-arm/translate.c
+++ b/target-arm/translate.c
@@ -4874,20 +4874,21 @@ static int disas_neon_data_insn(CPUState * env, 
DisasContext *s, uint32_t insn)
                 if (!(insn & (1 << 21)) || (q && ((rd | rm) & 1))) {
                     return 1;
                 }
+                shift = 64 - ((insn >> 16) & 0x3f);
                 for (pass = 0; pass < (q ? 4 : 2); pass++) {
                     tcg_gen_ld_f32(cpu_F0s, cpu_env,
                                    neon_reg_offset(rm, pass));
                     if (op & 1) {
                         if (u) {
-                            gen_vfp_ulto(0, shift);
+                            gen_vfp_toul(0, shift);
                         } else {
-                            gen_vfp_slto(0, shift);
+                            gen_vfp_tosl(0, shift);
                         }
                     } else {
                         if (u) {
-                            gen_vfp_toul(0, shift);
+                            gen_vfp_ulto(0, shift);
                         } else {
-                            gen_vfp_tosl(0, shift);
+                            gen_vfp_slto(0, shift);
                         }
                     }
                     tcg_gen_st_f32(cpu_F0s, cpu_env,
-- 
1.6.5