From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
To: qemu-devel@nongnu.org
Cc: edgar.iglesias@xilinx.com, peter.maydell@linaro.org
Subject: [PULL v1 4/8] target/microblaze: swx: Use atomic_cmpxchg
Date: Mon, 24 Aug 2020 12:00:37 +0200 [thread overview]
Message-ID: <20200824100041.1864420-5-edgar.iglesias@gmail.com> (raw)
In-Reply-To: <20200824100041.1864420-1-edgar.iglesias@gmail.com>
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com>
Use atomic_cmpxchg to implement the atomic cmpxchg sequence.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
---
target/microblaze/translate.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index c58f334a0f..530c15e5ad 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -1075,14 +1075,16 @@ static void dec_store(DisasContext *dc)
swx_skip = gen_new_label();
tcg_gen_brcond_tl(TCG_COND_NE, env_res_addr, addr, swx_skip);
- /* Compare the value loaded at lwx with current contents of
- the reserved location.
- FIXME: This only works for system emulation where we can expect
- this compare and the following write to be atomic. For user
- emulation we need to add atomicity between threads. */
+ /*
+ * Compare the value loaded at lwx with current contents of
+ * the reserved location.
+ */
tval = tcg_temp_new_i32();
- tcg_gen_qemu_ld_i32(tval, addr, cpu_mmu_index(&dc->cpu->env, false),
- MO_TEUL);
+
+ tcg_gen_atomic_cmpxchg_i32(tval, addr, env_res_val,
+ cpu_R[dc->rd], mem_index,
+ mop);
+
tcg_gen_brcond_i32(TCG_COND_NE, env_res_val, tval, swx_skip);
write_carryi(dc, 0);
tcg_temp_free_i32(tval);
@@ -1108,7 +1110,10 @@ static void dec_store(DisasContext *dc)
break;
}
}
- tcg_gen_qemu_st_i32(cpu_R[dc->rd], addr, mem_index, mop);
+
+ if (!ex) {
+ tcg_gen_qemu_st_i32(cpu_R[dc->rd], addr, mem_index, mop);
+ }
/* Verify alignment if needed. */
if (dc->cpu->cfg.unaligned_exceptions && size > 1) {
--
2.25.1
next prev parent reply other threads:[~2020-08-24 10:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-24 10:00 [PULL v1 0/8] Xilinx queue 2020-08-14 Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 1/8] target/microblaze: mbar: Transfer dc->rd to mbar_imm Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 2/8] target/microblaze: mbar: Move LOG_DIS to before sleep Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 3/8] target/microblaze: mbar: Add support for data-access barriers Edgar E. Iglesias
2020-08-24 10:00 ` Edgar E. Iglesias [this message]
2020-08-24 10:00 ` [PULL v1 5/8] configure: microblaze: Enable mttcg Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 6/8] target/microblaze: mbar: Trap sleeps from user-space Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 7/8] microblaze: petalogix-ml605: Add device-tree source Edgar E. Iglesias
2020-08-24 10:00 ` [PULL v1 8/8] microblaze: petalogix-s3adsp1800: " Edgar E. Iglesias
2020-08-24 15:32 ` [PULL v1 0/8] Xilinx queue 2020-08-14 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200824100041.1864420-5-edgar.iglesias@gmail.com \
--to=edgar.iglesias@gmail.com \
--cc=edgar.iglesias@xilinx.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.