OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

trace/mem: Pass MemOpIdx to trace_mem_get_info

Browse Source 
We (will) often have the complete MemOpIdx handy, so use that.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-07-25 12:44:12 -10:00
parent abe2e23eb7
commit b0702c91c6
5 changed files with 49 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accel/tcg/atomic_common.c.inc
View File

@ -17,7 +17,7 @@ static uint16_t atomic_trace_rmw_pre(CPUArchState *env, target_ulong addr,
MemOpIdx oi) MemOpIdx oi)
{ {
CPUState *cpu = env_cpu(env); CPUState *cpu = env_cpu(env);
uint16_t info = trace_mem_get_info(get_memop(oi), get_mmuidx(oi), false); uint16_t info = trace_mem_get_info(oi, false);
trace_guest_mem_before_exec(cpu, addr, info); trace_guest_mem_before_exec(cpu, addr, info);
trace_guest_mem_before_exec(cpu, addr, info | TRACE_MEM_ST); trace_guest_mem_before_exec(cpu, addr, info | TRACE_MEM_ST);
@ -36,7 +36,7 @@ static void atomic_trace_rmw_post(CPUArchState *env, target_ulong addr,
static uint16_t atomic_trace_ld_pre(CPUArchState *env, target_ulong addr, static uint16_t atomic_trace_ld_pre(CPUArchState *env, target_ulong addr,
MemOpIdx oi) MemOpIdx oi)
{ {
uint16_t info = trace_mem_get_info(get_memop(oi), get_mmuidx(oi), false); uint16_t info = trace_mem_get_info(oi, false);
trace_guest_mem_before_exec(env_cpu(env), addr, info); trace_guest_mem_before_exec(env_cpu(env), addr, info);
@ -52,7 +52,7 @@ static void atomic_trace_ld_post(CPUArchState *env, target_ulong addr,
static uint16_t atomic_trace_st_pre(CPUArchState *env, target_ulong addr, static uint16_t atomic_trace_st_pre(CPUArchState *env, target_ulong addr,
MemOpIdx oi) MemOpIdx oi)
{ {
uint16_t info = trace_mem_get_info(get_memop(oi), get_mmuidx(oi), true); uint16_t info = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), addr, info); trace_guest_mem_before_exec(env_cpu(env), addr, info);

12
accel/tcg/cputlb.c
View File

@ -2112,14 +2112,12 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr,
int mmu_idx, uintptr_t retaddr, int mmu_idx, uintptr_t retaddr,
MemOp op, FullLoadHelper *full_load) MemOp op, FullLoadHelper *full_load)
{ {
uint16_t meminfo; MemOpIdx oi = make_memop_idx(op, mmu_idx);
MemOpIdx oi; uint16_t meminfo = trace_mem_get_info(oi, false);
uint64_t ret; uint64_t ret;
meminfo = trace_mem_get_info(op, mmu_idx, false);
trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); trace_guest_mem_before_exec(env_cpu(env), addr, meminfo);
oi = make_memop_idx(op, mmu_idx);
ret = full_load(env, addr, oi, retaddr); ret = full_load(env, addr, oi, retaddr);
qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo);
@ -2551,13 +2549,11 @@ static inline void QEMU_ALWAYS_INLINE
cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val, cpu_store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
int mmu_idx, uintptr_t retaddr, MemOp op) int mmu_idx, uintptr_t retaddr, MemOp op)
{ {
MemOpIdx oi; MemOpIdx oi = make_memop_idx(op, mmu_idx);
uint16_t meminfo; uint16_t meminfo = trace_mem_get_info(oi, true);
meminfo = trace_mem_get_info(op, mmu_idx, true);
trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); trace_guest_mem_before_exec(env_cpu(env), addr, meminfo);
oi = make_memop_idx(op, mmu_idx);
store_helper(env, addr, val, oi, retaddr, op); store_helper(env, addr, val, oi, retaddr, op);
qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo); qemu_plugin_vcpu_mem_cb(env_cpu(env), addr, meminfo);

42
accel/tcg/user-exec.c
View File

@ -888,8 +888,9 @@ int cpu_signal_handler(int host_signum, void *pinfo,
uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr) uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_UB, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint32_t ret; uint32_t ret;
uint16_t meminfo = trace_mem_get_info(MO_UB, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = ldub_p(g2h(env_cpu(env), ptr)); ret = ldub_p(g2h(env_cpu(env), ptr));
@ -904,8 +905,9 @@ int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr)
uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr) uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_BEUW, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint32_t ret; uint32_t ret;
uint16_t meminfo = trace_mem_get_info(MO_BEUW, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = lduw_be_p(g2h(env_cpu(env), ptr)); ret = lduw_be_p(g2h(env_cpu(env), ptr));
@ -920,8 +922,9 @@ int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr)
uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr) uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_BEUL, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint32_t ret; uint32_t ret;
uint16_t meminfo = trace_mem_get_info(MO_BEUL, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = ldl_be_p(g2h(env_cpu(env), ptr)); ret = ldl_be_p(g2h(env_cpu(env), ptr));
@ -931,8 +934,9 @@ uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr)
uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr) uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_BEQ, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint64_t ret; uint64_t ret;
uint16_t meminfo = trace_mem_get_info(MO_BEQ, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = ldq_be_p(g2h(env_cpu(env), ptr)); ret = ldq_be_p(g2h(env_cpu(env), ptr));
@ -942,8 +946,9 @@ uint64_t cpu_ldq_be_data(CPUArchState *env, abi_ptr ptr)
uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr) uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_LEUW, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint32_t ret; uint32_t ret;
uint16_t meminfo = trace_mem_get_info(MO_LEUW, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = lduw_le_p(g2h(env_cpu(env), ptr)); ret = lduw_le_p(g2h(env_cpu(env), ptr));
@ -958,8 +963,9 @@ int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr)
uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr) uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_LEUL, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint32_t ret; uint32_t ret;
uint16_t meminfo = trace_mem_get_info(MO_LEUL, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = ldl_le_p(g2h(env_cpu(env), ptr)); ret = ldl_le_p(g2h(env_cpu(env), ptr));
@ -969,8 +975,9 @@ uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr)
uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr) uint64_t cpu_ldq_le_data(CPUArchState *env, abi_ptr ptr)
{ {
MemOpIdx oi = make_memop_idx(MO_LEQ, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, false);
uint64_t ret; uint64_t ret;
uint16_t meminfo = trace_mem_get_info(MO_LEQ, MMU_USER_IDX, false);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
ret = ldq_le_p(g2h(env_cpu(env), ptr)); ret = ldq_le_p(g2h(env_cpu(env), ptr));
@ -1065,7 +1072,8 @@ uint64_t cpu_ldq_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr)
void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val) void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_UB, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_UB, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stb_p(g2h(env_cpu(env), ptr), val); stb_p(g2h(env_cpu(env), ptr), val);
@ -1074,7 +1082,8 @@ void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val) void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_BEUW, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_BEUW, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stw_be_p(g2h(env_cpu(env), ptr), val); stw_be_p(g2h(env_cpu(env), ptr), val);
@ -1083,7 +1092,8 @@ void cpu_stw_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val) void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_BEUL, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_BEUL, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stl_be_p(g2h(env_cpu(env), ptr), val); stl_be_p(g2h(env_cpu(env), ptr), val);
@ -1092,7 +1102,8 @@ void cpu_stl_be_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val) void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_BEQ, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_BEQ, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stq_be_p(g2h(env_cpu(env), ptr), val); stq_be_p(g2h(env_cpu(env), ptr), val);
@ -1101,7 +1112,8 @@ void cpu_stq_be_data(CPUArchState *env, abi_ptr ptr, uint64_t val)
void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val) void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_LEUW, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_LEUW, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stw_le_p(g2h(env_cpu(env), ptr), val); stw_le_p(g2h(env_cpu(env), ptr), val);
@ -1110,7 +1122,8 @@ void cpu_stw_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val) void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_LEUL, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_LEUL, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stl_le_p(g2h(env_cpu(env), ptr), val); stl_le_p(g2h(env_cpu(env), ptr), val);
@ -1119,7 +1132,8 @@ void cpu_stl_le_data(CPUArchState *env, abi_ptr ptr, uint32_t val)
void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val) void cpu_stq_le_data(CPUArchState *env, abi_ptr ptr, uint64_t val)
{ {
uint16_t meminfo = trace_mem_get_info(MO_LEQ, MMU_USER_IDX, true); MemOpIdx oi = make_memop_idx(MO_LEQ, MMU_USER_IDX);
uint16_t meminfo = trace_mem_get_info(oi, true);
trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo);
stq_le_p(g2h(env_cpu(env), ptr), val); stq_le_p(g2h(env_cpu(env), ptr), val);

8
tcg/tcg-op.c
View File

@ -2866,7 +2866,7 @@ static inline void plugin_gen_mem_callbacks(TCGv vaddr, uint16_t info)
void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
{ {
MemOp orig_memop; MemOp orig_memop;
uint16_t info = trace_mem_get_info(memop, idx, 0); uint16_t info = trace_mem_get_info(make_memop_idx(memop, idx), 0);
tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD);
memop = tcg_canonicalize_memop(memop, 0, 0); memop = tcg_canonicalize_memop(memop, 0, 0);
@ -2904,7 +2904,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
{ {
TCGv_i32 swap = NULL; TCGv_i32 swap = NULL;
uint16_t info = trace_mem_get_info(memop, idx, 1); uint16_t info = trace_mem_get_info(make_memop_idx(memop, idx), 1);
tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST);
memop = tcg_canonicalize_memop(memop, 0, 1); memop = tcg_canonicalize_memop(memop, 0, 1);
@ -2956,7 +2956,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop)
tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD);
memop = tcg_canonicalize_memop(memop, 1, 0); memop = tcg_canonicalize_memop(memop, 1, 0);
info = trace_mem_get_info(memop, idx, 0); info = trace_mem_get_info(make_memop_idx(memop, idx), 0);
trace_guest_mem_before_tcg(tcg_ctx->cpu, cpu_env, addr, info); trace_guest_mem_before_tcg(tcg_ctx->cpu, cpu_env, addr, info);
orig_memop = memop; orig_memop = memop;
@ -3004,7 +3004,7 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop)
tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST); tcg_gen_req_mo(TCG_MO_LD_ST | TCG_MO_ST_ST);
memop = tcg_canonicalize_memop(memop, 1, 1); memop = tcg_canonicalize_memop(memop, 1, 1);
info = trace_mem_get_info(memop, idx, 1); info = trace_mem_get_info(make_memop_idx(memop, idx), 1);
trace_guest_mem_before_tcg(tcg_ctx->cpu, cpu_env, addr, info); trace_guest_mem_before_tcg(tcg_ctx->cpu, cpu_env, addr, info);
if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) { if (!TCG_TARGET_HAS_MEMORY_BSWAP && (memop & MO_BSWAP)) {

32
trace/mem.h
View File

@ -10,7 +10,7 @@
#ifndef TRACE__MEM_H #ifndef TRACE__MEM_H
#define TRACE__MEM_H #define TRACE__MEM_H
#include "tcg/tcg.h" #include "exec/memopidx.h"
#define TRACE_MEM_SZ_SHIFT_MASK 0xf /* size shift mask */ #define TRACE_MEM_SZ_SHIFT_MASK 0xf /* size shift mask */
#define TRACE_MEM_SE (1ULL << 4) /* sign extended (y/n) */ #define TRACE_MEM_SE (1ULL << 4) /* sign extended (y/n) */
@ -19,45 +19,33 @@
#define TRACE_MEM_MMU_SHIFT 8 /* mmu idx */ #define TRACE_MEM_MMU_SHIFT 8 /* mmu idx */
/** /**
* trace_mem_build_info: * trace_mem_get_info:
* *
* Return a value for the 'info' argument in guest memory access traces. * Return a value for the 'info' argument in guest memory access traces.
*/ */
static inline uint16_t trace_mem_build_info(int size_shift, bool sign_extend, static inline uint16_t trace_mem_get_info(MemOpIdx oi, bool store)
MemOp endianness, bool store,
unsigned int mmu_idx)
{ {
MemOp op = get_memop(oi);
uint32_t size_shift = op & MO_SIZE;
bool sign_extend = op & MO_SIGN;
bool big_endian = (op & MO_BSWAP) == MO_BE;
uint16_t res; uint16_t res;
res = size_shift & TRACE_MEM_SZ_SHIFT_MASK; res = size_shift & TRACE_MEM_SZ_SHIFT_MASK;
if (sign_extend) { if (sign_extend) {
res |= TRACE_MEM_SE; res |= TRACE_MEM_SE;
} }
if (endianness == MO_BE) { if (big_endian) {
res |= TRACE_MEM_BE; res |= TRACE_MEM_BE;
} }
if (store) { if (store) {
res |= TRACE_MEM_ST; res |= TRACE_MEM_ST;
} }
#ifdef CONFIG_SOFTMMU #ifdef CONFIG_SOFTMMU
res |= mmu_idx << TRACE_MEM_MMU_SHIFT; res |= get_mmuidx(oi) << TRACE_MEM_MMU_SHIFT;
#endif #endif
return res; return res;
} }
/**
* trace_mem_get_info:
*
* Return a value for the 'info' argument in guest memory access traces.
*/
static inline uint16_t trace_mem_get_info(MemOp op,
unsigned int mmu_idx,
bool store)
{
return trace_mem_build_info(op & MO_SIZE, !!(op & MO_SIGN),
op & MO_BSWAP, store,
mmu_idx);
}
#endif /* TRACE__MEM_H */ #endif /* TRACE__MEM_H */