Richard Henderson <richard.hender...@linaro.org> writes:
> With the tracing hooks, the inline functions are no longer > so simple. Reduce the amount of preprocessor obfuscation > by expanding the text of each of the functions generated. > The result is only slightly larger than the original. > > Signed-off-by: Richard Henderson <richard.hender...@linaro.org> Reviewed-by: Alex Bennée <alex.ben...@linaro.org> > --- > include/exec/cpu_ldst.h | 54 +++-- > include/exec/cpu_ldst_useronly_template.h | 159 --------------- > accel/tcg/user-exec.c | 236 ++++++++++++++++++++++ > 3 files changed, 262 insertions(+), 187 deletions(-) > delete mode 100644 include/exec/cpu_ldst_useronly_template.h > > diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h > index 41b98ba801..0f3c49a005 100644 > --- a/include/exec/cpu_ldst.h > +++ b/include/exec/cpu_ldst.h > @@ -120,35 +120,33 @@ static inline void clear_helper_retaddr(void) > > /* In user-only mode we provide only the _code and _data accessors. */ > > -#define MEMSUFFIX _data > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_useronly_template.h" > +uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr); > +uint32_t cpu_lduw_data(CPUArchState *env, abi_ptr ptr); > +uint32_t cpu_ldl_data(CPUArchState *env, abi_ptr ptr); > +uint64_t cpu_ldq_data(CPUArchState *env, abi_ptr ptr); > +int cpu_ldsb_data(CPUArchState *env, abi_ptr ptr); > +int cpu_ldsw_data(CPUArchState *env, abi_ptr ptr); > > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_useronly_template.h" > +uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > +uint32_t cpu_lduw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > +uint32_t cpu_ldl_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > +uint64_t cpu_ldq_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > +int cpu_ldsb_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > +int cpu_ldsw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr); > > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_useronly_template.h" > +void cpu_stb_data(CPUArchState *env, abi_ptr ptr, uint32_t val); > +void cpu_stw_data(CPUArchState *env, abi_ptr ptr, uint32_t val); > +void cpu_stl_data(CPUArchState *env, abi_ptr ptr, uint32_t val); > +void cpu_stq_data(CPUArchState *env, abi_ptr ptr, uint64_t val); > > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_useronly_template.h" > -#undef MEMSUFFIX > - > -#define MEMSUFFIX _code > -#define CODE_ACCESS > -#define DATA_SIZE 1 > -#include "exec/cpu_ldst_useronly_template.h" > - > -#define DATA_SIZE 2 > -#include "exec/cpu_ldst_useronly_template.h" > - > -#define DATA_SIZE 4 > -#include "exec/cpu_ldst_useronly_template.h" > - > -#define DATA_SIZE 8 > -#include "exec/cpu_ldst_useronly_template.h" > -#undef MEMSUFFIX > -#undef CODE_ACCESS > +void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr); > +void cpu_stw_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr); > +void cpu_stl_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr); > +void cpu_stq_data_ra(CPUArchState *env, abi_ptr ptr, > + uint64_t val, uintptr_t retaddr); > > /* > * Provide the same *_mmuidx_ra interface as for softmmu. > @@ -520,6 +518,8 @@ void cpu_stq_mmuidx_ra(CPUArchState *env, abi_ptr addr, > uint64_t val, > #undef CPU_MMU_INDEX > #undef MEMSUFFIX > > +#endif /* defined(CONFIG_USER_ONLY) */ > + > uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr addr); > uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr addr); > uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr addr); > @@ -535,8 +535,6 @@ static inline int cpu_ldsw_code(CPUArchState *env, > abi_ptr addr) > return (int16_t)cpu_lduw_code(env, addr); > } > > -#endif /* defined(CONFIG_USER_ONLY) */ > - > /** > * tlb_vaddr_to_host: > * @env: CPUArchState > diff --git a/include/exec/cpu_ldst_useronly_template.h > b/include/exec/cpu_ldst_useronly_template.h > deleted file mode 100644 > index e5a3d1983a..0000000000 > --- a/include/exec/cpu_ldst_useronly_template.h > +++ /dev/null > @@ -1,159 +0,0 @@ > -/* > - * User-only accessor function support > - * > - * Generate inline load/store functions for one data size. > - * > - * Generate a store function as well as signed and unsigned loads. > - * > - * Not used directly but included from cpu_ldst.h. > - * > - * Copyright (c) 2015 Linaro Limited > - * > - * This library is free software; you can redistribute it and/or > - * modify it under the terms of the GNU Lesser General Public > - * License as published by the Free Software Foundation; either > - * version 2 of the License, or (at your option) any later version. > - * > - * This library is distributed in the hope that it will be useful, > - * but WITHOUT ANY WARRANTY; without even the implied warranty of > - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - * Lesser General Public License for more details. > - * > - * You should have received a copy of the GNU Lesser General Public > - * License along with this library; if not, see > <http://www.gnu.org/licenses/>. > - */ > - > -#if !defined(CODE_ACCESS) > -#include "trace-root.h" > -#endif > - > -#include "trace/mem.h" > - > -#if DATA_SIZE == 8 > -#define SUFFIX q > -#define USUFFIX q > -#define DATA_TYPE uint64_t > -#define SHIFT 3 > -#elif DATA_SIZE == 4 > -#define SUFFIX l > -#define USUFFIX l > -#define DATA_TYPE uint32_t > -#define SHIFT 2 > -#elif DATA_SIZE == 2 > -#define SUFFIX w > -#define USUFFIX uw > -#define DATA_TYPE uint16_t > -#define DATA_STYPE int16_t > -#define SHIFT 1 > -#elif DATA_SIZE == 1 > -#define SUFFIX b > -#define USUFFIX ub > -#define DATA_TYPE uint8_t > -#define DATA_STYPE int8_t > -#define SHIFT 0 > -#else > -#error unsupported data size > -#endif > - > -#if DATA_SIZE == 8 > -#define RES_TYPE uint64_t > -#else > -#define RES_TYPE uint32_t > -#endif > - > -static inline RES_TYPE > -glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr) > -{ > - RES_TYPE ret; > -#ifdef CODE_ACCESS > - set_helper_retaddr(1); > - ret = glue(glue(ld, USUFFIX), _p)(g2h(ptr)); > - clear_helper_retaddr(); > -#else > - 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 > - return ret; > -} > - > -#ifndef CODE_ACCESS > -static inline RES_TYPE > -glue(glue(glue(cpu_ld, USUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, > - abi_ptr ptr, > - uintptr_t retaddr) > -{ > - RES_TYPE ret; > - set_helper_retaddr(retaddr); > - ret = glue(glue(cpu_ld, USUFFIX), MEMSUFFIX)(env, ptr); > - clear_helper_retaddr(); > - return ret; > -} > -#endif > - > -#if DATA_SIZE <= 2 > -static inline int > -glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr) > -{ > - int ret; > -#ifdef CODE_ACCESS > - set_helper_retaddr(1); > - ret = glue(glue(lds, SUFFIX), _p)(g2h(ptr)); > - clear_helper_retaddr(); > -#else > - 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); > -#endif > - return ret; > -} > - > -#ifndef CODE_ACCESS > -static inline int > -glue(glue(glue(cpu_lds, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, > - abi_ptr ptr, > - uintptr_t retaddr) > -{ > - int ret; > - set_helper_retaddr(retaddr); > - ret = glue(glue(cpu_lds, SUFFIX), MEMSUFFIX)(env, ptr); > - clear_helper_retaddr(); > - return ret; > -} > -#endif /* CODE_ACCESS */ > -#endif /* DATA_SIZE <= 2 */ > - > -#ifndef CODE_ACCESS > -static inline void > -glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(CPUArchState *env, abi_ptr ptr, > - RES_TYPE v) > -{ > - 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); > -} > - > -static inline void > -glue(glue(glue(cpu_st, SUFFIX), MEMSUFFIX), _ra)(CPUArchState *env, > - abi_ptr ptr, > - RES_TYPE v, > - uintptr_t retaddr) > -{ > - set_helper_retaddr(retaddr); > - glue(glue(cpu_st, SUFFIX), MEMSUFFIX)(env, ptr, v); > - clear_helper_retaddr(); > -} > -#endif > - > -#undef RES_TYPE > -#undef DATA_TYPE > -#undef DATA_STYPE > -#undef SUFFIX > -#undef USUFFIX > -#undef DATA_SIZE > -#undef SHIFT > diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c > index b09f7a1577..79da4219bb 100644 > --- a/accel/tcg/user-exec.c > +++ b/accel/tcg/user-exec.c > @@ -26,6 +26,8 @@ > #include "translate-all.h" > #include "exec/helper-proto.h" > #include "qemu/atomic128.h" > +#include "trace-root.h" > +#include "trace/mem.h" > > #undef EAX > #undef ECX > @@ -734,6 +736,240 @@ int cpu_signal_handler(int host_signum, void *pinfo, > > /* The softmmu versions of these helpers are in cputlb.c. */ > > +uint32_t cpu_ldub_data(CPUArchState *env, abi_ptr ptr) > +{ > + 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); > + ret = ldub_p(g2h(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +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(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +uint32_t cpu_lduw_data(CPUArchState *env, abi_ptr ptr) > +{ > + uint32_t ret; > + uint16_t meminfo = trace_mem_get_info(MO_TEUW, MMU_USER_IDX, false); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + ret = lduw_p(g2h(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +int cpu_ldsw_data(CPUArchState *env, abi_ptr ptr) > +{ > + int ret; > + uint16_t meminfo = trace_mem_get_info(MO_TESW, MMU_USER_IDX, false); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + ret = ldsw_p(g2h(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +uint32_t cpu_ldl_data(CPUArchState *env, abi_ptr ptr) > +{ > + uint32_t ret; > + uint16_t meminfo = trace_mem_get_info(MO_TEUL, MMU_USER_IDX, false); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + ret = ldl_p(g2h(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +uint64_t cpu_ldq_data(CPUArchState *env, abi_ptr ptr) > +{ > + uint64_t ret; > + uint16_t meminfo = trace_mem_get_info(MO_TEQ, MMU_USER_IDX, false); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + ret = ldq_p(g2h(ptr)); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > + return ret; > +} > + > +uint32_t cpu_ldub_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(retaddr); > + ret = cpu_ldub_data(env, ptr); > + clear_helper_retaddr(); > + return ret; > +} > + > +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; > +} > + > +uint32_t cpu_lduw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(retaddr); > + ret = cpu_lduw_data(env, ptr); > + clear_helper_retaddr(); > + return ret; > +} > + > +int cpu_ldsw_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > +{ > + int ret; > + > + set_helper_retaddr(retaddr); > + ret = cpu_ldsw_data(env, ptr); > + clear_helper_retaddr(); > + return ret; > +} > + > +uint32_t cpu_ldl_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(retaddr); > + ret = cpu_ldl_data(env, ptr); > + clear_helper_retaddr(); > + return ret; > +} > + > +uint64_t cpu_ldq_data_ra(CPUArchState *env, abi_ptr ptr, uintptr_t retaddr) > +{ > + uint64_t ret; > + > + set_helper_retaddr(retaddr); > + ret = cpu_ldq_data(env, ptr); > + clear_helper_retaddr(); > + return ret; > +} > + > +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); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + stb_p(g2h(ptr), val); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > +} > + > +void cpu_stw_data(CPUArchState *env, abi_ptr ptr, uint32_t val) > +{ > + uint16_t meminfo = trace_mem_get_info(MO_TEUW, MMU_USER_IDX, true); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + stw_p(g2h(ptr), val); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > +} > + > +void cpu_stl_data(CPUArchState *env, abi_ptr ptr, uint32_t val) > +{ > + uint16_t meminfo = trace_mem_get_info(MO_TEUL, MMU_USER_IDX, true); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + stl_p(g2h(ptr), val); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > +} > + > +void cpu_stq_data(CPUArchState *env, abi_ptr ptr, uint64_t val) > +{ > + uint16_t meminfo = trace_mem_get_info(MO_TEQ, MMU_USER_IDX, true); > + > + trace_guest_mem_before_exec(env_cpu(env), ptr, meminfo); > + stq_p(g2h(ptr), val); > + qemu_plugin_vcpu_mem_cb(env_cpu(env), ptr, meminfo); > +} > + > +void cpu_stb_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr) > +{ > + set_helper_retaddr(retaddr); > + cpu_stb_data(env, ptr, val); > + clear_helper_retaddr(); > +} > + > +void cpu_stw_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr) > +{ > + set_helper_retaddr(retaddr); > + cpu_stw_data(env, ptr, val); > + clear_helper_retaddr(); > +} > + > +void cpu_stl_data_ra(CPUArchState *env, abi_ptr ptr, > + uint32_t val, uintptr_t retaddr) > +{ > + set_helper_retaddr(retaddr); > + cpu_stl_data(env, ptr, val); > + clear_helper_retaddr(); > +} > + > +void cpu_stq_data_ra(CPUArchState *env, abi_ptr ptr, > + uint64_t val, uintptr_t retaddr) > +{ > + set_helper_retaddr(retaddr); > + cpu_stq_data(env, ptr, val); > + clear_helper_retaddr(); > +} > + > +uint32_t cpu_ldub_code(CPUArchState *env, abi_ptr ptr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(1); > + ret = ldub_p(g2h(ptr)); > + clear_helper_retaddr(); > + return ret; > +} > + > +uint32_t cpu_lduw_code(CPUArchState *env, abi_ptr ptr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(1); > + ret = lduw_p(g2h(ptr)); > + clear_helper_retaddr(); > + return ret; > +} > + > +uint32_t cpu_ldl_code(CPUArchState *env, abi_ptr ptr) > +{ > + uint32_t ret; > + > + set_helper_retaddr(1); > + ret = ldl_p(g2h(ptr)); > + clear_helper_retaddr(); > + return ret; > +} > + > +uint64_t cpu_ldq_code(CPUArchState *env, abi_ptr ptr) > +{ > + uint64_t ret; > + > + set_helper_retaddr(1); > + ret = ldq_p(g2h(ptr)); > + clear_helper_retaddr(); > + return ret; > +} > + > /* Do not allow unaligned operations to proceed. Return the host address. > */ > static void *atomic_mmu_lookup(CPUArchState *env, target_ulong addr, > int size, uintptr_t retaddr) -- Alex Bennée
