Commit 955fd0ad authored by Alistair Francis's avatar Alistair Francis Committed by Peter Maydell
Browse files

target/arm: Correct exclusive store cmpxchg memop mask



When we perform the atomic_cmpxchg operation we want to perform the
operation on a pair of 32-bit registers. Previously we were just passing
the register size in which was set to MO_32. This would result in the
high register to be ignored. To fix this issue we hardcode the size to
be 64-bits long when operating on 32-bit pairs.

Reviewed-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Tested-by: default avatarPortia Stephens <portia.stephens@xilinx.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20170815145714.17635-2-richard.henderson@linaro.org
Message-Id: <bc18dddca56e8c2ea4a3def48d33ceb5d21d1fff.1502488636.git.alistair.francis@xilinx.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 47025a01
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1913,7 +1913,7 @@ static void gen_store_exclusive(DisasContext *s, int rd, int rt, int rt2,
            tcg_gen_concat32_i64(val, cpu_exclusive_val, cpu_exclusive_high);
            tcg_gen_atomic_cmpxchg_i64(tmp, addr, val, tmp,
                                       get_mem_index(s),
                                       size | MO_ALIGN | s->be_data);
                                       MO_64 | MO_ALIGN | s->be_data);
            tcg_gen_setcond_i64(TCG_COND_NE, tmp, tmp, val);
            tcg_temp_free_i64(val);
        } else if (s->be_data == MO_LE) {