[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 24/27] Revert "tcg/tci: Use exec/cpu_ldst.h interfaces"
From: |
Richard Henderson |
Subject: |
[PATCH v7 24/27] Revert "tcg/tci: Use exec/cpu_ldst.h interfaces" |
Date: |
Tue, 1 Jun 2021 08:01:03 -0700 |
This reverts commit dc09f047eddec8f4a1991c4f5f4a428d7aa3f2c0.
For tcg, tracepoints are expanded inline in tcg opcodes.
Using a helper which generates a second tracepoint is incorrect.
For system mode, the extraction and re-packing of MemOp and mmu_idx
lost the alignment information from MemOp. So we were no longer
raising alignment exceptions for !TARGET_ALIGNED_ONLY guests.
This can be seen in tests/tcg/xtensa/test_load_store.S.
For user mode, we must update to the new signature of g2h() so that
the revert compiles. We can leave set_helper_retaddr for later.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tci.c | 73 ++++++++++++++++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 28 deletions(-)
diff --git a/tcg/tci.c b/tcg/tci.c
index 36558210a1..8b17b244bf 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -286,34 +286,51 @@ static bool tci_compare64(uint64_t u0, uint64_t u1,
TCGCond condition)
return result;
}
-#define qemu_ld_ub \
- cpu_ldub_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_leuw \
- cpu_lduw_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_leul \
- cpu_ldl_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_leq \
- cpu_ldq_le_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_beuw \
- cpu_lduw_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_beul \
- cpu_ldl_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_ld_beq \
- cpu_ldq_be_mmuidx_ra(env, taddr, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_b(X) \
- cpu_stb_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_lew(X) \
- cpu_stw_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_lel(X) \
- cpu_stl_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_leq(X) \
- cpu_stq_le_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_bew(X) \
- cpu_stw_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_bel(X) \
- cpu_stl_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
-#define qemu_st_beq(X) \
- cpu_stq_be_mmuidx_ra(env, taddr, X, get_mmuidx(oi), (uintptr_t)tb_ptr)
+#ifdef CONFIG_SOFTMMU
+# define qemu_ld_ub \
+ helper_ret_ldub_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_leuw \
+ helper_le_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_leul \
+ helper_le_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_leq \
+ helper_le_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_beuw \
+ helper_be_lduw_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_beul \
+ helper_be_ldul_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_ld_beq \
+ helper_be_ldq_mmu(env, taddr, oi, (uintptr_t)tb_ptr)
+# define qemu_st_b(X) \
+ helper_ret_stb_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_lew(X) \
+ helper_le_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_lel(X) \
+ helper_le_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_leq(X) \
+ helper_le_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_bew(X) \
+ helper_be_stw_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_bel(X) \
+ helper_be_stl_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+# define qemu_st_beq(X) \
+ helper_be_stq_mmu(env, taddr, X, oi, (uintptr_t)tb_ptr)
+#else
+# define qemu_ld_ub ldub_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_leuw lduw_le_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_leul (uint32_t)ldl_le_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_leq ldq_le_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_beuw lduw_be_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_beul (uint32_t)ldl_be_p(g2h(env_cpu(env), taddr))
+# define qemu_ld_beq ldq_be_p(g2h(env_cpu(env), taddr))
+# define qemu_st_b(X) stb_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_lew(X) stw_le_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_lel(X) stl_le_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_leq(X) stq_le_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_bew(X) stw_be_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_bel(X) stl_be_p(g2h(env_cpu(env), taddr), X)
+# define qemu_st_beq(X) stq_be_p(g2h(env_cpu(env), taddr), X)
+#endif
static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong taddr,
TCGMemOpIdx oi, const void *tb_ptr)
--
2.25.1
- [PATCH v7 11/27] tcg/tci: Use ffi for calls, (continued)
- [PATCH v7 11/27] tcg/tci: Use ffi for calls, Richard Henderson, 2021/06/01
- [PATCH v7 19/27] tcg/tci: Implement extract, sextract, Richard Henderson, 2021/06/01
- [PATCH v7 17/27] tcg/tci: Implement movcond, Richard Henderson, 2021/06/01
- [PATCH v7 12/27] tcg/tci: Reserve r13 for a temporary, Richard Henderson, 2021/06/01
- [PATCH v7 14/27] tcg/tci: Remove tci_write_reg, Richard Henderson, 2021/06/01
- [PATCH v7 18/27] tcg/tci: Implement andc, orc, eqv, nand, nor, Richard Henderson, 2021/06/01
- [PATCH v7 26/27] tcg/tci: Use {set,clear}_helper_retaddr, Richard Henderson, 2021/06/01
- [PATCH v7 24/27] Revert "tcg/tci: Use exec/cpu_ldst.h interfaces",
Richard Henderson <=
- [PATCH v7 23/27] tcg/tci: Split out tci_qemu_ld, tci_qemu_st, Richard Henderson, 2021/06/01
- [PATCH v7 20/27] tcg/tci: Implement clz, ctz, ctpop, Richard Henderson, 2021/06/01
- Re: [PATCH v7 00/27] TCI fixes and cleanups, no-reply, 2021/06/01
- Re: [PATCH v7 00/27] TCI fixes and cleanups, Philippe Mathieu-Daudé, 2021/06/19