[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] microblaze: Move the saving of the reservatio
From: |
edgar . iglesias |
Subject: |
[Qemu-devel] [PATCH 06/10] microblaze: Move the saving of the reservation addr into gen_load |
Date: |
Thu, 24 Oct 2013 23:08:53 +0200 |
From: "Edgar E. Iglesias" <address@hidden>
No functional change.
Signed-off-by: Edgar E. Iglesias <address@hidden>
---
target-microblaze/translate.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 232015a..021a504 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -863,7 +863,7 @@ static void dec_imm(DisasContext *dc)
}
static inline void gen_load(DisasContext *dc, TCGv dst, TCGv addr,
- unsigned int size)
+ unsigned int size, bool exclusive)
{
int mem_index = cpu_mmu_index(dc->env);
@@ -875,6 +875,10 @@ static inline void gen_load(DisasContext *dc, TCGv dst,
TCGv addr,
tcg_gen_qemu_ld32u(dst, addr, mem_index);
} else
cpu_abort(dc->env, "Incorrect load size %d\n", size);
+
+ if (exclusive) {
+ tcg_gen_st_tl(addr, cpu_env, offsetof(CPUMBState, res_addr));
+ }
}
static inline TCGv *compute_ldst_addr(DisasContext *dc, TCGv *t)
@@ -1046,7 +1050,7 @@ static void dec_load(DisasContext *dc)
* into v. If the load succeeds, we verify alignment of the
* address and if that succeeds we write into the destination reg.
*/
- gen_load(dc, v, *addr, size);
+ gen_load(dc, v, *addr, size, ex);
tcg_gen_movi_tl(cpu_SR[SR_PC], dc->pc);
gen_helper_memalign(cpu_env, *addr, tcg_const_tl(dc->rd),
@@ -1061,20 +1065,19 @@ static void dec_load(DisasContext *dc)
tcg_temp_free(v);
} else {
if (dc->rd) {
- gen_load(dc, cpu_R[dc->rd], *addr, size);
+ gen_load(dc, cpu_R[dc->rd], *addr, size, ex);
if (rev) {
dec_byteswap(dc, cpu_R[dc->rd], cpu_R[dc->rd], size);
}
} else {
/* We are loading into r0, no need to reverse. */
- gen_load(dc, env_imm, *addr, size);
+ gen_load(dc, env_imm, *addr, size, ex);
}
}
if (ex) { /* lwx */
/* no support for for AXI exclusive so always clear C */
write_carryi(dc, 0);
- tcg_gen_st_tl(*addr, cpu_env, offsetof(CPUMBState, res_addr));
}
if (addr == &t)
--
1.7.10.4
- [Qemu-devel] [PATCH 00/10] MicroBlaze queue, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 01/10] microblaze: Clarify expected input of write_carry, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 02/10] microblaze: Make write_carryi input a boolean, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 03/10] microblaze: Simplify andn by using tcg_gen_andc, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 04/10] microblaze: Improve srl, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 05/10] microblaze: Improve src, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 06/10] microblaze: Move the saving of the reservation addr into gen_load,
edgar . iglesias <=
- [Qemu-devel] [PATCH 07/10] microblaze: Turn res_addr into a tcg global, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 08/10] microblaze: At swx, check that the reserved word is unmodified, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 09/10] hw/microblaze: Indentation cleanups, edgar . iglesias, 2013/10/24
- [Qemu-devel] [PATCH 10/10] hw/microblaze: Add support for loading initrd images, edgar . iglesias, 2013/10/24