| Message ID | 20250313034524.3069690-5-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | accel/tcg, codebase: Build once patches | expand |
On 3/12/25 20:44, Richard Henderson wrote: > Split out the *_mmu api, which no longer uses > target specific argument types. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/cpu-ldst-common.h | 122 +++++++++++++++++++++++++++++++++ > include/exec/cpu_ldst.h | 108 +---------------------------- > 2 files changed, 123 insertions(+), 107 deletions(-) > create mode 100644 include/exec/cpu-ldst-common.h > > diff --git a/include/exec/cpu-ldst-common.h b/include/exec/cpu-ldst-common.h > new file mode 100644 > index 0000000000..c46a6ade5d > --- /dev/null > +++ b/include/exec/cpu-ldst-common.h > @@ -0,0 +1,122 @@ > +/* > + * Software MMU support > + * > + * SPDX-License-Identifier: LGPL-2.1-or-later > + */ > + > +#ifndef CPU_LDST_COMMON_H > +#define CPU_LDST_COMMON_H > + > +#ifndef CONFIG_TCG > +#error Can only include this header with TCG > +#endif > + > +#include "exec/memopidx.h" > +#include "exec/vaddr.h" > +#include "exec/mmu-access-type.h" > +#include "qemu/int128.h" > + > +uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > +uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > +uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > +uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > +Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra); > + > +void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val, > + MemOpIdx oi, uintptr_t ra); > +void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val, > + MemOpIdx oi, uintptr_t ra); > +void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val, > + MemOpIdx oi, uintptr_t ra); > +void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val, > + MemOpIdx oi, uintptr_t ra); > +void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val, > + MemOpIdx oi, uintptr_t ra); > + > +uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr, > + uint32_t cmpv, uint32_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr, > + uint32_t cmpv, uint32_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr, > + uint32_t cmpv, uint32_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr, > + uint64_t cmpv, uint64_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr, > + uint32_t cmpv, uint32_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr, > + uint32_t cmpv, uint32_t newv, > + MemOpIdx oi, uintptr_t retaddr); > +uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr, > + uint64_t cmpv, uint64_t newv, > + MemOpIdx oi, uintptr_t retaddr); > + > +#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \ > +TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ > + (CPUArchState *env, vaddr addr, TYPE val, \ > + MemOpIdx oi, uintptr_t retaddr); > + > +#ifdef CONFIG_ATOMIC64 > +#define GEN_ATOMIC_HELPER_ALL(NAME) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \ > + GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \ > + GEN_ATOMIC_HELPER(NAME, uint64_t, q_be) > +#else > +#define GEN_ATOMIC_HELPER_ALL(NAME) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ > + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) > +#endif > + > +GEN_ATOMIC_HELPER_ALL(fetch_add) > +GEN_ATOMIC_HELPER_ALL(fetch_sub) > +GEN_ATOMIC_HELPER_ALL(fetch_and) > +GEN_ATOMIC_HELPER_ALL(fetch_or) > +GEN_ATOMIC_HELPER_ALL(fetch_xor) > +GEN_ATOMIC_HELPER_ALL(fetch_smin) > +GEN_ATOMIC_HELPER_ALL(fetch_umin) > +GEN_ATOMIC_HELPER_ALL(fetch_smax) > +GEN_ATOMIC_HELPER_ALL(fetch_umax) > + > +GEN_ATOMIC_HELPER_ALL(add_fetch) > +GEN_ATOMIC_HELPER_ALL(sub_fetch) > +GEN_ATOMIC_HELPER_ALL(and_fetch) > +GEN_ATOMIC_HELPER_ALL(or_fetch) > +GEN_ATOMIC_HELPER_ALL(xor_fetch) > +GEN_ATOMIC_HELPER_ALL(smin_fetch) > +GEN_ATOMIC_HELPER_ALL(umin_fetch) > +GEN_ATOMIC_HELPER_ALL(smax_fetch) > +GEN_ATOMIC_HELPER_ALL(umax_fetch) > + > +GEN_ATOMIC_HELPER_ALL(xchg) > + > +#undef GEN_ATOMIC_HELPER_ALL > +#undef GEN_ATOMIC_HELPER > + > +Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr, > + Int128 cmpv, Int128 newv, > + MemOpIdx oi, uintptr_t retaddr); > +Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, > + Int128 cmpv, Int128 newv, > + MemOpIdx oi, uintptr_t retaddr); > + > +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, > + MemOpIdx oi, uintptr_t ra); > +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr, > + MemOpIdx oi, uintptr_t ra); > +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr, > + MemOpIdx oi, uintptr_t ra); > +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr, > + MemOpIdx oi, uintptr_t ra); > + > +#endif /* CPU_LDST_COMMON_H */ > diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h > index ddd8e0cf48..1fbdbe59ae 100644 > --- a/include/exec/cpu_ldst.h > +++ b/include/exec/cpu_ldst.h > @@ -66,11 +66,8 @@ > #error Can only include this header with TCG > #endif > > -#include "exec/memopidx.h" > -#include "exec/vaddr.h" > +#include "exec/cpu-ldst-common.h" > #include "exec/abi_ptr.h" > -#include "exec/mmu-access-type.h" > -#include "qemu/int128.h" > > #if defined(CONFIG_USER_ONLY) > #include "user/guest-host.h" > @@ -157,100 +154,6 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val, > void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val, > int mmu_idx, uintptr_t ra); > > -uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > -uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > -uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > -uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); > -Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra); > - > -void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val, > - MemOpIdx oi, uintptr_t ra); > -void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val, > - MemOpIdx oi, uintptr_t ra); > -void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val, > - MemOpIdx oi, uintptr_t ra); > -void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val, > - MemOpIdx oi, uintptr_t ra); > -void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val, > - MemOpIdx oi, uintptr_t ra); > - > -uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr, > - uint32_t cmpv, uint32_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr, > - uint32_t cmpv, uint32_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr, > - uint32_t cmpv, uint32_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr, > - uint64_t cmpv, uint64_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr, > - uint32_t cmpv, uint32_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr, > - uint32_t cmpv, uint32_t newv, > - MemOpIdx oi, uintptr_t retaddr); > -uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr, > - uint64_t cmpv, uint64_t newv, > - MemOpIdx oi, uintptr_t retaddr); > - > -#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \ > -TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ > - (CPUArchState *env, vaddr addr, TYPE val, \ > - MemOpIdx oi, uintptr_t retaddr); > - > -#ifdef CONFIG_ATOMIC64 > -#define GEN_ATOMIC_HELPER_ALL(NAME) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \ > - GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \ > - GEN_ATOMIC_HELPER(NAME, uint64_t, q_be) > -#else > -#define GEN_ATOMIC_HELPER_ALL(NAME) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ > - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) > -#endif > - > -GEN_ATOMIC_HELPER_ALL(fetch_add) > -GEN_ATOMIC_HELPER_ALL(fetch_sub) > -GEN_ATOMIC_HELPER_ALL(fetch_and) > -GEN_ATOMIC_HELPER_ALL(fetch_or) > -GEN_ATOMIC_HELPER_ALL(fetch_xor) > -GEN_ATOMIC_HELPER_ALL(fetch_smin) > -GEN_ATOMIC_HELPER_ALL(fetch_umin) > -GEN_ATOMIC_HELPER_ALL(fetch_smax) > -GEN_ATOMIC_HELPER_ALL(fetch_umax) > - > -GEN_ATOMIC_HELPER_ALL(add_fetch) > -GEN_ATOMIC_HELPER_ALL(sub_fetch) > -GEN_ATOMIC_HELPER_ALL(and_fetch) > -GEN_ATOMIC_HELPER_ALL(or_fetch) > -GEN_ATOMIC_HELPER_ALL(xor_fetch) > -GEN_ATOMIC_HELPER_ALL(smin_fetch) > -GEN_ATOMIC_HELPER_ALL(umin_fetch) > -GEN_ATOMIC_HELPER_ALL(smax_fetch) > -GEN_ATOMIC_HELPER_ALL(umax_fetch) > - > -GEN_ATOMIC_HELPER_ALL(xchg) > - > -#undef GEN_ATOMIC_HELPER_ALL > -#undef GEN_ATOMIC_HELPER > - > -Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr, > - Int128 cmpv, Int128 newv, > - MemOpIdx oi, uintptr_t retaddr); > -Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, > - Int128 cmpv, Int128 newv, > - MemOpIdx oi, uintptr_t retaddr); > - > #if TARGET_BIG_ENDIAN > # define cpu_lduw_data cpu_lduw_be_data > # define cpu_ldsw_data cpu_ldsw_be_data > @@ -297,15 +200,6 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, > # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra > #endif > > -uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, > - MemOpIdx oi, uintptr_t ra); > -uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr, > - MemOpIdx oi, uintptr_t ra); > -uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr, > - MemOpIdx oi, uintptr_t ra); > -uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr, > - MemOpIdx oi, uintptr_t ra); > - > 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); Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/include/exec/cpu-ldst-common.h b/include/exec/cpu-ldst-common.h new file mode 100644 index 0000000000..c46a6ade5d --- /dev/null +++ b/include/exec/cpu-ldst-common.h @@ -0,0 +1,122 @@ +/* + * Software MMU support + * + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#ifndef CPU_LDST_COMMON_H +#define CPU_LDST_COMMON_H + +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif + +#include "exec/memopidx.h" +#include "exec/vaddr.h" +#include "exec/mmu-access-type.h" +#include "qemu/int128.h" + +uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); +uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); +uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); +uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); +Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra); + +void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val, + MemOpIdx oi, uintptr_t ra); +void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val, + MemOpIdx oi, uintptr_t ra); +void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val, + MemOpIdx oi, uintptr_t ra); +void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val, + MemOpIdx oi, uintptr_t ra); +void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val, + MemOpIdx oi, uintptr_t ra); + +uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr, + uint32_t cmpv, uint32_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr, + uint32_t cmpv, uint32_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr, + uint32_t cmpv, uint32_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr, + uint64_t cmpv, uint64_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr, + uint32_t cmpv, uint32_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr, + uint32_t cmpv, uint32_t newv, + MemOpIdx oi, uintptr_t retaddr); +uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr, + uint64_t cmpv, uint64_t newv, + MemOpIdx oi, uintptr_t retaddr); + +#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \ +TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ + (CPUArchState *env, vaddr addr, TYPE val, \ + MemOpIdx oi, uintptr_t retaddr); + +#ifdef CONFIG_ATOMIC64 +#define GEN_ATOMIC_HELPER_ALL(NAME) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \ + GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \ + GEN_ATOMIC_HELPER(NAME, uint64_t, q_be) +#else +#define GEN_ATOMIC_HELPER_ALL(NAME) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ + GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) +#endif + +GEN_ATOMIC_HELPER_ALL(fetch_add) +GEN_ATOMIC_HELPER_ALL(fetch_sub) +GEN_ATOMIC_HELPER_ALL(fetch_and) +GEN_ATOMIC_HELPER_ALL(fetch_or) +GEN_ATOMIC_HELPER_ALL(fetch_xor) +GEN_ATOMIC_HELPER_ALL(fetch_smin) +GEN_ATOMIC_HELPER_ALL(fetch_umin) +GEN_ATOMIC_HELPER_ALL(fetch_smax) +GEN_ATOMIC_HELPER_ALL(fetch_umax) + +GEN_ATOMIC_HELPER_ALL(add_fetch) +GEN_ATOMIC_HELPER_ALL(sub_fetch) +GEN_ATOMIC_HELPER_ALL(and_fetch) +GEN_ATOMIC_HELPER_ALL(or_fetch) +GEN_ATOMIC_HELPER_ALL(xor_fetch) +GEN_ATOMIC_HELPER_ALL(smin_fetch) +GEN_ATOMIC_HELPER_ALL(umin_fetch) +GEN_ATOMIC_HELPER_ALL(smax_fetch) +GEN_ATOMIC_HELPER_ALL(umax_fetch) + +GEN_ATOMIC_HELPER_ALL(xchg) + +#undef GEN_ATOMIC_HELPER_ALL +#undef GEN_ATOMIC_HELPER + +Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr, + Int128 cmpv, Int128 newv, + MemOpIdx oi, uintptr_t retaddr); +Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, + Int128 cmpv, Int128 newv, + MemOpIdx oi, uintptr_t retaddr); + +uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, + MemOpIdx oi, uintptr_t ra); +uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr, + MemOpIdx oi, uintptr_t ra); +uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr, + MemOpIdx oi, uintptr_t ra); +uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr, + MemOpIdx oi, uintptr_t ra); + +#endif /* CPU_LDST_COMMON_H */ diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index ddd8e0cf48..1fbdbe59ae 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -66,11 +66,8 @@ #error Can only include this header with TCG #endif -#include "exec/memopidx.h" -#include "exec/vaddr.h" +#include "exec/cpu-ldst-common.h" #include "exec/abi_ptr.h" -#include "exec/mmu-access-type.h" -#include "qemu/int128.h" #if defined(CONFIG_USER_ONLY) #include "user/guest-host.h" @@ -157,100 +154,6 @@ void cpu_stl_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint32_t val, void cpu_stq_le_mmuidx_ra(CPUArchState *env, abi_ptr ptr, uint64_t val, int mmu_idx, uintptr_t ra); -uint8_t cpu_ldb_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); -uint16_t cpu_ldw_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); -uint32_t cpu_ldl_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); -uint64_t cpu_ldq_mmu(CPUArchState *env, vaddr ptr, MemOpIdx oi, uintptr_t ra); -Int128 cpu_ld16_mmu(CPUArchState *env, vaddr addr, MemOpIdx oi, uintptr_t ra); - -void cpu_stb_mmu(CPUArchState *env, vaddr ptr, uint8_t val, - MemOpIdx oi, uintptr_t ra); -void cpu_stw_mmu(CPUArchState *env, vaddr ptr, uint16_t val, - MemOpIdx oi, uintptr_t ra); -void cpu_stl_mmu(CPUArchState *env, vaddr ptr, uint32_t val, - MemOpIdx oi, uintptr_t ra); -void cpu_stq_mmu(CPUArchState *env, vaddr ptr, uint64_t val, - MemOpIdx oi, uintptr_t ra); -void cpu_st16_mmu(CPUArchState *env, vaddr addr, Int128 val, - MemOpIdx oi, uintptr_t ra); - -uint32_t cpu_atomic_cmpxchgb_mmu(CPUArchState *env, vaddr addr, - uint32_t cmpv, uint32_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint32_t cpu_atomic_cmpxchgw_le_mmu(CPUArchState *env, vaddr addr, - uint32_t cmpv, uint32_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint32_t cpu_atomic_cmpxchgl_le_mmu(CPUArchState *env, vaddr addr, - uint32_t cmpv, uint32_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint64_t cpu_atomic_cmpxchgq_le_mmu(CPUArchState *env, vaddr addr, - uint64_t cmpv, uint64_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint32_t cpu_atomic_cmpxchgw_be_mmu(CPUArchState *env, vaddr addr, - uint32_t cmpv, uint32_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint32_t cpu_atomic_cmpxchgl_be_mmu(CPUArchState *env, vaddr addr, - uint32_t cmpv, uint32_t newv, - MemOpIdx oi, uintptr_t retaddr); -uint64_t cpu_atomic_cmpxchgq_be_mmu(CPUArchState *env, vaddr addr, - uint64_t cmpv, uint64_t newv, - MemOpIdx oi, uintptr_t retaddr); - -#define GEN_ATOMIC_HELPER(NAME, TYPE, SUFFIX) \ -TYPE cpu_atomic_ ## NAME ## SUFFIX ## _mmu \ - (CPUArchState *env, vaddr addr, TYPE val, \ - MemOpIdx oi, uintptr_t retaddr); - -#ifdef CONFIG_ATOMIC64 -#define GEN_ATOMIC_HELPER_ALL(NAME) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) \ - GEN_ATOMIC_HELPER(NAME, uint64_t, q_le) \ - GEN_ATOMIC_HELPER(NAME, uint64_t, q_be) -#else -#define GEN_ATOMIC_HELPER_ALL(NAME) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, b) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, w_be) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_le) \ - GEN_ATOMIC_HELPER(NAME, uint32_t, l_be) -#endif - -GEN_ATOMIC_HELPER_ALL(fetch_add) -GEN_ATOMIC_HELPER_ALL(fetch_sub) -GEN_ATOMIC_HELPER_ALL(fetch_and) -GEN_ATOMIC_HELPER_ALL(fetch_or) -GEN_ATOMIC_HELPER_ALL(fetch_xor) -GEN_ATOMIC_HELPER_ALL(fetch_smin) -GEN_ATOMIC_HELPER_ALL(fetch_umin) -GEN_ATOMIC_HELPER_ALL(fetch_smax) -GEN_ATOMIC_HELPER_ALL(fetch_umax) - -GEN_ATOMIC_HELPER_ALL(add_fetch) -GEN_ATOMIC_HELPER_ALL(sub_fetch) -GEN_ATOMIC_HELPER_ALL(and_fetch) -GEN_ATOMIC_HELPER_ALL(or_fetch) -GEN_ATOMIC_HELPER_ALL(xor_fetch) -GEN_ATOMIC_HELPER_ALL(smin_fetch) -GEN_ATOMIC_HELPER_ALL(umin_fetch) -GEN_ATOMIC_HELPER_ALL(smax_fetch) -GEN_ATOMIC_HELPER_ALL(umax_fetch) - -GEN_ATOMIC_HELPER_ALL(xchg) - -#undef GEN_ATOMIC_HELPER_ALL -#undef GEN_ATOMIC_HELPER - -Int128 cpu_atomic_cmpxchgo_le_mmu(CPUArchState *env, vaddr addr, - Int128 cmpv, Int128 newv, - MemOpIdx oi, uintptr_t retaddr); -Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, - Int128 cmpv, Int128 newv, - MemOpIdx oi, uintptr_t retaddr); - #if TARGET_BIG_ENDIAN # define cpu_lduw_data cpu_lduw_be_data # define cpu_ldsw_data cpu_ldsw_be_data @@ -297,15 +200,6 @@ Int128 cpu_atomic_cmpxchgo_be_mmu(CPUArchState *env, vaddr addr, # define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra #endif -uint8_t cpu_ldb_code_mmu(CPUArchState *env, vaddr addr, - MemOpIdx oi, uintptr_t ra); -uint16_t cpu_ldw_code_mmu(CPUArchState *env, vaddr addr, - MemOpIdx oi, uintptr_t ra); -uint32_t cpu_ldl_code_mmu(CPUArchState *env, vaddr addr, - MemOpIdx oi, uintptr_t ra); -uint64_t cpu_ldq_code_mmu(CPUArchState *env, vaddr addr, - MemOpIdx oi, uintptr_t ra); - 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);
Split out the *_mmu api, which no longer uses target specific argument types. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/cpu-ldst-common.h | 122 +++++++++++++++++++++++++++++++++ include/exec/cpu_ldst.h | 108 +---------------------------- 2 files changed, 123 insertions(+), 107 deletions(-) create mode 100644 include/exec/cpu-ldst-common.h