From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH 02/28] cputlb: Use trace_mem_get_info instead of trace_mem_build_info
Date: Wed, 11 Dec 2019 20:00:13 -0800 [thread overview]
Message-ID: <20191212040039.26546-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20191212040039.26546-1-richard.henderson@linaro.org>
In the cpu_ldst templates, we already require a MemOp, and it
is cleaner and clearer to pass that instead of 3 separate
arguments describing the memory operation.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/exec/cpu_ldst_template.h | 22 +++++++++++-----------
include/exec/cpu_ldst_useronly_template.h | 12 ++++++------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/include/exec/cpu_ldst_template.h b/include/exec/cpu_ldst_template.h
index 54b5e858ce..0ad5de3ef9 100644
--- a/include/exec/cpu_ldst_template.h
+++ b/include/exec/cpu_ldst_template.h
@@ -86,9 +86,9 @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
RES_TYPE res;
target_ulong addr;
int mmu_idx = CPU_MMU_INDEX;
- TCGMemOpIdx oi;
+ MemOp op = MO_TE | SHIFT;
#if !defined(SOFTMMU_CODE_ACCESS)
- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, false, mmu_idx);
+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
#endif
@@ -96,9 +96,9 @@ glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
entry = tlb_entry(env, mmu_idx, addr);
if (unlikely(entry->ADDR_READ !=
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
- oi = make_memop_idx(SHIFT, mmu_idx);
+ TCGMemOpIdx oi = make_memop_idx(op, mmu_idx);
res = glue(glue(helper_ret_ld, URETSUFFIX), MMUSUFFIX)(env, addr,
- oi, retaddr);
+ oi, retaddr);
} else {
uintptr_t hostaddr = addr + entry->addend;
res = glue(glue(ld, USUFFIX), _p)((uint8_t *)hostaddr);
@@ -125,9 +125,9 @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
int res;
target_ulong addr;
int mmu_idx = CPU_MMU_INDEX;
- TCGMemOpIdx oi;
-#if !defined(SOFTMMU_CODE_ACCESS)
- uint16_t meminfo = trace_mem_build_info(SHIFT, true, MO_TE, false, mmu_idx);
+ MemOp op = MO_TE | MO_SIGN | SHIFT;
+#ifndef SOFTMMU_CODE_ACCESS
+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
#endif
@@ -135,7 +135,7 @@ glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
entry = tlb_entry(env, mmu_idx, addr);
if (unlikely(entry->ADDR_READ !=
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
- oi = make_memop_idx(SHIFT, mmu_idx);
+ TCGMemOpIdx oi = make_memop_idx(op & ~MO_SIGN, mmu_idx);
res = (DATA_STYPE)glue(glue(helper_ret_ld, SRETSUFFIX),
MMUSUFFIX)(env, addr, oi, retaddr);
} else {
@@ -167,9 +167,9 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
CPUTLBEntry *entry;
target_ulong addr;
int mmu_idx = CPU_MMU_INDEX;
- TCGMemOpIdx oi;
+ MemOp op = MO_TE | SHIFT;
#if !defined(SOFTMMU_CODE_ACCESS)
- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, true, mmu_idx);
+ uint16_t meminfo = trace_mem_get_info(op, mmu_idx, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
#endif
@@ -177,7 +177,7 @@ glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env,
entry = tlb_entry(env, mmu_idx, addr);
if (unlikely(tlb_addr_write(entry) !=
(addr & (TARGET_PAGE_MASK | (DATA_SIZE - 1))))) {
- oi = make_memop_idx(SHIFT, mmu_idx);
+ TCGMemOpIdx oi = make_memop_idx(op, mmu_idx);
glue(glue(helper_ret_st, SUFFIX), MMUSUFFIX)(env, addr, v, oi,
retaddr);
} else {
diff --git a/include/exec/cpu_ldst_useronly_template.h b/include/exec/cpu_ldst_useronly_template.h
index dbdc7a845d..e5a3d1983a 100644
--- a/include/exec/cpu_ldst_useronly_template.h
+++ b/include/exec/cpu_ldst_useronly_template.h
@@ -70,8 +70,8 @@ glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)
ret = glue(glue(ld, USUFFIX), _p)(g2h(ptr));
clear_helper_retaddr();
#else
- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, false,
- MMU_USER_IDX);
+ MemOp op = MO_TE | SHIFT;
+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = glue(glue(ld, USUFFIX), _p)(g2h(ptr));
#endif
@@ -102,8 +102,8 @@ glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr)
ret = glue(glue(lds, SUFFIX), _p)(g2h(ptr));
clear_helper_retaddr();
#else
- uint16_t meminfo = trace_mem_build_info(SHIFT, true, MO_TE, false,
- MMU_USER_IDX);
+ MemOp op = MO_TE | MO_SIGN | SHIFT;
+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = glue(glue(lds, SUFFIX), _p)(g2h(ptr));
qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo);
@@ -131,8 +131,8 @@ static inline void
glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr,
RES_TYPE v)
{
- uint16_t meminfo = trace_mem_build_info(SHIFT, false, MO_TE, true,
- MMU_USER_IDX);
+ MemOp op = MO_TE | SHIFT;
+ uint16_t meminfo = trace_mem_get_info(op, MMU_USER_IDX, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
glue(glue(st, SUFFIX), _p)(g2h(ptr), v);
qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo);
--
2.20.1
next prev parent reply other threads:[~2019-12-12 4:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-12 4:00 [PATCH 00/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 01/28] target/xtensa: Use probe_access for itlb_hit_test Richard Henderson
2019-12-12 18:45 ` Max Filippov
2019-12-12 4:00 ` Richard Henderson [this message]
2019-12-12 4:00 ` [PATCH 03/28] trace: Remove trace_mem_build_info_no_se_[bl]e Richard Henderson
2019-12-12 4:00 ` [PATCH 04/28] cputlb: Move body of cpu_ldst_template.h out of line Richard Henderson
2019-12-12 4:00 ` [PATCH 05/28] translator: Use cpu_ld*_code instead of open-coding Richard Henderson
2019-12-12 4:00 ` [PATCH 06/28] cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code Richard Henderson
2019-12-12 9:33 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 07/28] cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only Richard Henderson
2019-12-12 4:00 ` [PATCH 08/28] target/i386: Use cpu_*_mmuidx_ra instead of templates Richard Henderson
2019-12-12 7:19 ` Paolo Bonzini
2019-12-12 4:00 ` [PATCH 09/28] target/s390x: Include tcg.h in mem_helper.c Richard Henderson
2019-12-12 10:36 ` David Hildenbrand
2019-12-12 4:00 ` [PATCH 10/28] target/arm: Include tcg.h in sve_helper.c Richard Henderson
2019-12-12 4:00 ` [PATCH 11/28] accel/tcg: Include tcg.h in tcg-runtime.c Richard Henderson
2019-12-12 12:28 ` Alex Bennée
2019-12-12 4:00 ` [PATCH 12/28] linux-user: Include tcg.h in syscall.c Richard Henderson
2019-12-12 4:00 ` [PATCH 13/28] linux-user: Include trace-root.h in syscall-trace.h Richard Henderson
2019-12-12 4:00 ` [PATCH 14/28] cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c Richard Henderson
2019-12-12 20:02 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 15/28] target/nios2: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 16/28] target/alpha: " Richard Henderson
2019-12-12 4:00 ` [PATCH 17/28] target/cris: " Richard Henderson
2019-12-12 4:00 ` [PATCH 18/28] target/i386: Remove MMU_MODE{0,1,2}_SUFFIX Richard Henderson
2019-12-12 8:11 ` Paolo Bonzini
2019-12-12 4:00 ` [PATCH 19/28] target/microblaze: " Richard Henderson
2019-12-12 4:00 ` [PATCH 20/28] target/sh4: Remove MMU_MODE{0,1}_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 21/28] target/unicore32: " Richard Henderson
2019-12-12 4:00 ` [PATCH 22/28] target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX Richard Henderson
2019-12-12 18:46 ` Max Filippov
2019-12-12 4:00 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Richard Henderson
2019-12-12 8:53 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX Laurent Vivier
2019-12-12 9:44 ` [PATCH 23/28] target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0, 1}_SUFFIX Laurent Vivier
2019-12-12 14:27 ` Richard Henderson
2019-12-12 4:00 ` [PATCH 24/28] target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 9:32 ` Aleksandar Markovic
2019-12-12 4:00 ` [PATCH 25/28] target/s390x: " Richard Henderson
2019-12-12 10:38 ` David Hildenbrand
2019-12-12 4:00 ` [PATCH 26/28] target/ppc: " Richard Henderson
2019-12-12 5:13 ` David Gibson
2019-12-12 4:00 ` [PATCH 27/28] cputlb: Remove support for MMU_MODE*_SUFFIX Richard Henderson
2019-12-12 4:00 ` [PATCH 28/28] cputlb: Expand cpu_ldst_template.h in cputlb.c Richard Henderson
2019-12-12 10:00 ` Aleksandar Markovic
2019-12-12 20:34 ` [PATCH 00/28] cputlb: Remove support for MMU_MODE*_SUFFIX Aleksandar Markovic
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=20191212040039.26546-3-richard.henderson@linaro.org \
--to=richard.henderson@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).