]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
target/ppc: Fix lqarx to set cpu_reserve
authorNicholas Piggin <npiggin@gmail.com>
Mon, 5 Jun 2023 02:54:42 +0000 (12:54 +1000)
committerMichael Tokarev <mjt@tls.msk.ru>
Sun, 11 Jun 2023 08:07:26 +0000 (11:07 +0300)
lqarx does not set cpu_reserve, which causes stqcx. to never succeed.

Cc: qemu-stable@nongnu.org
Fixes: 94bf2658676 ("target/ppc: Use atomic load for LQ and LQARX")
Fixes: 57b38ffd0c6 ("target/ppc: Use tcg_gen_qemu_{ld,st}_i128 for LQARX, LQ, STQ")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230605025445.161932-1-npiggin@gmail.com>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
(cherry picked from commit e025e8f5a8a7e32409bb4c7c509d752486113188)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
target/ppc/translate.c

index f603f1a939e168cfb5535e151edc18bb3c34fcc9..49a6b918427ac5435bd83f5f6dd007b6100b3ad1 100644 (file)
@@ -3803,6 +3803,7 @@ static void gen_lqarx(DisasContext *ctx)
         tcg_gen_qemu_ld_i64(lo, EA, ctx->mem_idx, MO_BEUQ);
     }
 
+    tcg_gen_mov_tl(cpu_reserve, EA);
     tcg_gen_st_tl(hi, cpu_env, offsetof(CPUPPCState, reserve_val));
     tcg_gen_st_tl(lo, cpu_env, offsetof(CPUPPCState, reserve_val2));
 }