| Message ID | 20210803041443.55452-22-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Unaligned access for user-only | expand |
Richard Henderson <richard.henderson@linaro.org> writes: > We are already inconsistent about whether or not > MO_SIGN is set in trace_mem_get_info. Dropping it > entirely allows some simplification. I think once 6.2 opens up we should just drop all the trace_mem stuff: Subject: [PATCH v1 5/7] docs: mark intention to deprecate TCG tracing functionality Date: Wed, 5 May 2021 10:22:57 +0100 Message-Id: <20210505092259.8202-6-alex.bennee@linaro.org> > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > accel/tcg/cputlb.c | 10 +++------- > accel/tcg/user-exec.c | 45 ++++++------------------------------------- > 2 files changed, 9 insertions(+), 46 deletions(-) > > diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c > index 116b289907..acdd20b1bc 100644 > --- a/accel/tcg/cputlb.c > +++ b/accel/tcg/cputlb.c > @@ -2110,7 +2110,6 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, > meminfo = trace_mem_get_info(op, mmu_idx, false); > trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); > > - op &= ~MO_SIGN; > oi = make_memop_idx(op, mmu_idx); > ret = full_load(env, addr, oi, retaddr); > > @@ -2128,8 +2127,7 @@ uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int mmu_idx, uintptr_t ra) > { > - return (int8_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_SB, > - full_ldub_mmu); > + return (int8_t)cpu_ldub_mmuidx_ra(env, addr, mmu_idx, ra); > } > > uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, > @@ -2141,8 +2139,7 @@ uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int mmu_idx, uintptr_t ra) > { > - return (int16_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_BESW, > - full_be_lduw_mmu); > + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra); > } > > uint32_t cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, > @@ -2166,8 +2163,7 @@ uint32_t cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, > int mmu_idx, uintptr_t ra) > { > - return (int16_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_LESW, > - full_le_lduw_mmu); > + return (int16_t)cpu_lduw_le_mmuidx_ra(env, addr, mmu_idx, ra); > } > > uint32_t cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, > diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > index 5ad808a25a..e687b9652e 100644 > --- a/accel/tcg/user-exec.c > +++ b/accel/tcg/user-exec.c > @@ -866,13 +866,7 @@ uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr) > > int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr) > { > - int ret; > - uint16_t meminfo = trace_mem_get_info(MO_SB, MMU_USER_IDX, false); > - > - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > - ret = ldsb_p(g2h(env_cpu(env), ptr)); > - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > - return ret; > + return (int8_t)cpu_ldub_data(env, ptr); > } > > uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr) > @@ -888,13 +882,7 @@ uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr) > > int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr) > { > - int ret; > - uint16_t meminfo = trace_mem_get_info(MO_BESW, MMU_USER_IDX, false); > - > - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > - ret = ldsw_be_p(g2h(env_cpu(env), ptr)); > - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > - return ret; > + return (int16_t)cpu_lduw_be_data(env, ptr); > } > > uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr) > @@ -932,13 +920,7 @@ uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr) > > int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr) > { > - int ret; > - uint16_t meminfo = trace_mem_get_info(MO_LESW, MMU_USER_IDX, false); > - > - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > - ret = ldsw_le_p(g2h(env_cpu(env), ptr)); > - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > - return ret; > + return (int16_t)cpu_lduw_le_data(env, ptr); > } > > uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr) > @@ -975,12 +957,7 @@ uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > > int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > { > - int ret; > - > - set_helper_retaddr(retaddr); > - ret = cpu_ldsb_data(env, ptr); > - clear_helper_retaddr(); > - return ret; > + return (int8_t)cpu_ldub_data_ra(env, ptr, retaddr); > } > > uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > @@ -995,12 +972,7 @@ uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > > int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > { > - int ret; > - > - set_helper_retaddr(retaddr); > - ret = cpu_ldsw_be_data(env, ptr); > - clear_helper_retaddr(); > - return ret; > + return (int16_t)cpu_lduw_be_data_ra(env, ptr, retaddr); > } > > uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > @@ -1035,12 +1007,7 @@ uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > > int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > { > - int ret; > - > - set_helper_retaddr(retaddr); > - ret = cpu_ldsw_le_data(env, ptr); > - clear_helper_retaddr(); > - return ret; > + return (int16_t)cpu_lduw_le_data_ra(env, ptr, retaddr); > } > > uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) -- Alex Bennée
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 116b289907..acdd20b1bc 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -2110,7 +2110,6 @@ static inline uint64_t cpu_load_helper(CPUArchState *env, abi_ptr addr, meminfo = trace_mem_get_info(op, mmu_idx, false); trace_guest_mem_before_exec(env_cpu(env), addr, meminfo); - op &= ~MO_SIGN; oi = make_memop_idx(op, mmu_idx); ret = full_load(env, addr, oi, retaddr); @@ -2128,8 +2127,7 @@ uint32_t cpu_ldub_mmuidx_ra(CPUArchState *env, abi_ptr addr, int cpu_ldsb_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra) { - return (int8_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_SB, - full_ldub_mmu); + return (int8_t)cpu_ldub_mmuidx_ra(env, addr, mmu_idx, ra); } uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, @@ -2141,8 +2139,7 @@ uint32_t cpu_lduw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, int cpu_ldsw_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra) { - return (int16_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_BESW, - full_be_lduw_mmu); + return (int16_t)cpu_lduw_be_mmuidx_ra(env, addr, mmu_idx, ra); } uint32_t cpu_ldl_be_mmuidx_ra(CPUArchState *env, abi_ptr addr, @@ -2166,8 +2163,7 @@ uint32_t cpu_lduw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, int cpu_ldsw_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, int mmu_idx, uintptr_t ra) { - return (int16_t)cpu_load_helper(env, addr, mmu_idx, ra, MO_LESW, - full_le_lduw_mmu); + return (int16_t)cpu_lduw_le_mmuidx_ra(env, addr, mmu_idx, ra); } uint32_t cpu_ldl_le_mmuidx_ra(CPUArchState *env, abi_ptr addr, diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 5ad808a25a..e687b9652e 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -866,13 +866,7 @@ uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr) int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr) { - int ret; - uint16_t meminfo = trace_mem_get_info(MO_SB, MMU_USER_IDX, false); - - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - ret = ldsb_p(g2h(env_cpu(env), ptr)); - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); - return ret; + return (int8_t)cpu_ldub_data(env, ptr); } uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr) @@ -888,13 +882,7 @@ uint32_t cpu_lduw_be_data(CPUArchState *env, abi_ptr ptr) int cpu_ldsw_be_data(CPUArchState *env, abi_ptr ptr) { - int ret; - uint16_t meminfo = trace_mem_get_info(MO_BESW, MMU_USER_IDX, false); - - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - ret = ldsw_be_p(g2h(env_cpu(env), ptr)); - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); - return ret; + return (int16_t)cpu_lduw_be_data(env, ptr); } uint32_t cpu_ldl_be_data(CPUArchState *env, abi_ptr ptr) @@ -932,13 +920,7 @@ uint32_t cpu_lduw_le_data(CPUArchState *env, abi_ptr ptr) int cpu_ldsw_le_data(CPUArchState *env, abi_ptr ptr) { - int ret; - uint16_t meminfo = trace_mem_get_info(MO_LESW, MMU_USER_IDX, false); - - trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); - ret = ldsw_le_p(g2h(env_cpu(env), ptr)); - qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); - return ret; + return (int16_t)cpu_lduw_le_data(env, ptr); } uint32_t cpu_ldl_le_data(CPUArchState *env, abi_ptr ptr) @@ -975,12 +957,7 @@ uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) { - int ret; - - set_helper_retaddr(retaddr); - ret = cpu_ldsb_data(env, ptr); - clear_helper_retaddr(); - return ret; + return (int8_t)cpu_ldub_data_ra(env, ptr, retaddr); } uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) @@ -995,12 +972,7 @@ uint32_t cpu_lduw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) int cpu_ldsw_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) { - int ret; - - set_helper_retaddr(retaddr); - ret = cpu_ldsw_be_data(env, ptr); - clear_helper_retaddr(); - return ret; + return (int16_t)cpu_lduw_be_data_ra(env, ptr, retaddr); } uint32_t cpu_ldl_be_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) @@ -1035,12 +1007,7 @@ uint32_t cpu_lduw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) int cpu_ldsw_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) { - int ret; - - set_helper_retaddr(retaddr); - ret = cpu_ldsw_le_data(env, ptr); - clear_helper_retaddr(); - return ret; + return (int16_t)cpu_lduw_le_data_ra(env, ptr, retaddr); } uint32_t cpu_ldl_le_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr)
We are already inconsistent about whether or not MO_SIGN is set in trace_mem_get_info. Dropping it entirely allows some simplification. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- accel/tcg/cputlb.c | 10 +++------- accel/tcg/user-exec.c | 45 ++++++------------------------------------- 2 files changed, 9 insertions(+), 46 deletions(-) -- 2.25.1