OSDN Git Service

target/s390x: check alignment in CDSG in the !CONFIG_ATOMIC128 case
authorAurelien Jarno <aurelien@aurel32.net>
Sun, 4 Jun 2017 20:20:34 +0000 (22:20 +0200)
committerRichard Henderson <rth@twiddle.net>
Tue, 6 Jun 2017 22:25:14 +0000 (15:25 -0700)
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>
target/s390x/mem_helper.c

index a8988e0..80caab9 100644 (file)
@@ -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);