[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 26/27] tcg/tci: Use {set,clear}_helper_retaddr
From: |
Richard Henderson |
Subject: |
[PATCH v7 26/27] tcg/tci: Use {set,clear}_helper_retaddr |
Date: |
Tue, 1 Jun 2021 08:01:05 -0700 |
Wrap guest memory operations for tci like we do for cpu_ld*_data.
We cannot actually use the cpu_ldst.h interface without duplicating
the memory trace operations performed within, which will already
have been expanded into the tcg opcode stream.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/tci.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/tcg/tci.c b/tcg/tci.c
index 11219fec18..c61eb6b900 100644
--- a/tcg/tci.c
+++ b/tcg/tci.c
@@ -290,10 +290,9 @@ static uint64_t tci_qemu_ld(CPUArchState *env,
target_ulong taddr,
TCGMemOpIdx oi, const void *tb_ptr)
{
MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE);
-
-#ifdef CONFIG_SOFTMMU
uintptr_t ra = (uintptr_t)tb_ptr;
+#ifdef CONFIG_SOFTMMU
switch (mop) {
case MO_UB:
return helper_ret_ldub_mmu(env, taddr, oi, ra);
@@ -326,6 +325,7 @@ static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong
taddr,
void *haddr = g2h(env_cpu(env), taddr);
uint64_t ret;
+ set_helper_retaddr(ra);
switch (mop) {
case MO_UB:
ret = ldub_p(haddr);
@@ -366,6 +366,7 @@ static uint64_t tci_qemu_ld(CPUArchState *env, target_ulong
taddr,
default:
g_assert_not_reached();
}
+ clear_helper_retaddr();
return ret;
#endif
}
@@ -374,10 +375,9 @@ static void tci_qemu_st(CPUArchState *env, target_ulong
taddr, uint64_t val,
TCGMemOpIdx oi, const void *tb_ptr)
{
MemOp mop = get_memop(oi) & (MO_BSWAP | MO_SSIZE);
-
-#ifdef CONFIG_SOFTMMU
uintptr_t ra = (uintptr_t)tb_ptr;
+#ifdef CONFIG_SOFTMMU
switch (mop) {
case MO_UB:
helper_ret_stb_mmu(env, taddr, val, oi, ra);
@@ -406,6 +406,7 @@ static void tci_qemu_st(CPUArchState *env, target_ulong
taddr, uint64_t val,
#else
void *haddr = g2h(env_cpu(env), taddr);
+ set_helper_retaddr(ra);
switch (mop) {
case MO_UB:
stb_p(haddr, val);
@@ -431,6 +432,7 @@ static void tci_qemu_st(CPUArchState *env, target_ulong
taddr, uint64_t val,
default:
g_assert_not_reached();
}
+ clear_helper_retaddr();
#endif
}
--
2.25.1
- Re: [PATCH v7 16/27] tcg/tci: Implement goto_ptr, (continued)
- [PATCH v7 21/27] tcg/tci: Implement mulu2, muls2, Richard Henderson, 2021/06/01
- [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 <=
- [PATCH v7 24/27] Revert "tcg/tci: Use exec/cpu_ldst.h interfaces", Richard Henderson, 2021/06/01
- [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