From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 4 Jun 2017 20:20:34 +0000 (+0200)
Subject: target/s390x: check alignment in CDSG in the !CONFIG_ATOMIC128 case
X-Git-Tag: v2.10.0-rc0~148^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0080f1bdbb409b12aa07c2a18caf3ff6a7c1f65;p=thirdparty%2Fqemu.git

target/s390x: check alignment in CDSG in the !CONFIG_ATOMIC128 case

The CDSG instruction requires a 16-byte alignement, as expressed in
the MO_ALIGN_16 passed to helper_atomic_cmpxchgo_be_mmu. In the non
parallel case, use check_alignment to enforce this.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <20170604202034.16615-4-aurelien@aurel32.net>
Signed-off-by: Richard Henderson <rth@twiddle.net>
---

diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index a8988e0293d..80caab9c9d0 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -1262,6 +1262,8 @@ void HELPER(cdsg)(CPUS390XState *env, uint64_t addr,
     } else {
         uint64_t oldh, oldl;
 
+        check_alignment(env, addr, 16, ra);
+
         oldh = cpu_ldq_data_ra(env, addr + 0, ra);
         oldl = cpu_ldq_data_ra(env, addr + 8, ra);