From: Richard Henderson <richard.henderson@linaro.org>
Date: Mon, 13 Jul 2020 13:36:07 +0000 (+0100)
Subject: target/arm: Fix mtedesc for do_mem_zpz
X-Git-Tag: v5.1.0-rc0~12^2~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdecb3fc1eb182d90666348a47afe63c493686e7;p=thirdparty%2Fqemu.git

target/arm: Fix mtedesc for do_mem_zpz

The mtedesc that was constructed was not actually passed in.
Found by Coverity (CID 1429996).

Fixes: d28d12f008e
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20200706202345.193676-1-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c
index 08f0fd15b28..88a2fb271d1 100644
--- a/target/arm/translate-sve.c
+++ b/target/arm/translate-sve.c
@@ -5275,7 +5275,7 @@ static void do_mem_zpz(DisasContext *s, int zt, int pg, int zm,
         desc = FIELD_DP32(desc, MTEDESC, ESIZE, 1 << msz);
         desc <<= SVE_MTEDESC_SHIFT;
     }
-    desc = simd_desc(vsz, vsz, scale);
+    desc = simd_desc(vsz, vsz, desc | scale);
     t_desc = tcg_const_i32(desc);
 
     tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, pg));