From: Philippe Mathieu-Daudé <[email protected]> All uses were converted to the explicit cpu_ld/st*_{be,le}_data*() helpers, no need for the non-explicit versions anymore.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- docs/devel/loads-stores.rst | 18 +++++++------- include/accel/tcg/cpu-ldst.h | 48 ------------------------------------ 2 files changed, 9 insertions(+), 57 deletions(-) diff --git a/docs/devel/loads-stores.rst b/docs/devel/loads-stores.rst index 3aeb8bbe8ba6..eeef55347857 100644 --- a/docs/devel/loads-stores.rst +++ b/docs/devel/loads-stores.rst @@ -150,13 +150,13 @@ store: ``cpu_st{size}{end}_mmuidx_ra(env, ptr, val, mmuidx, retaddr)`` - ``q`` : 64 bits ``end`` - - (empty) : for target endian, or 8 bit sizes + - (empty) : for 8 bit sizes - ``_be`` : big endian - ``_le`` : little endian Regexes for git grep: - - ``\<cpu_ld[us]\?[bwlq]\(_[bl]e\)\?_mmuidx_ra\>`` - - ``\<cpu_st[bwlq]\(_[bl]e\)\?_mmuidx_ra\>`` + - ``\<cpu_ld[us]\?\(b\|[wlq]\(_[bl]e\)\)_mmuidx_ra\>`` + - ``\<cpu_st\(b\|[wlq]\(_[bl]e\)\)_mmuidx_ra\>`` ``cpu_{ld,st}*_data_ra`` ~~~~~~~~~~~~~~~~~~~~~~~~ @@ -188,13 +188,13 @@ store: ``cpu_st{size}{end}_data_ra(env, ptr, val, ra)`` - ``q`` : 64 bits ``end`` - - (empty) : for target endian, or 8 bit sizes + - (empty) : for 8 bit sizes - ``_be`` : big endian - ``_le`` : little endian Regexes for git grep: - - ``\<cpu_ld[us]\?[bwlq]\(_[bl]e\)\?_data_ra\>`` - - ``\<cpu_st[bwlq]\(_[bl]e\)\?_data_ra\>`` + - ``\<cpu_ld[us]\?\(b\|[wlq]\(_[bl]e\)\)_data_ra\>`` + - ``\<cpu_st\(b\|[wlq]\(_[bl]e\)\)_data_ra\>`` ``cpu_{ld,st}*_data`` ~~~~~~~~~~~~~~~~~~~~~ @@ -227,13 +227,13 @@ store: ``cpu_st{size}{end}_data(env, ptr, val)`` - ``q`` : 64 bits ``end`` - - (empty) : for target endian, or 8 bit sizes + - (empty) : for 8 bit sizes - ``_be`` : big endian - ``_le`` : little endian Regexes for git grep: - - ``\<cpu_ld[us]\?[bwlq]\(_[bl]e\)\?_data\>`` - - ``\<cpu_st[bwlq]\(_[bl]e\)\?_data\+\>`` + - ``\<cpu_ld[us]\?\(b\|[wlq]\(_[bl]e\)\)_data\>`` + - ``\<cpu_st\(b\|[wlq]\(_[bl]e\)\)_data\+\>`` ``cpu_ld*_code_mmu`` ~~~~~~~~~~~~~~~~~~~~ diff --git a/include/accel/tcg/cpu-ldst.h b/include/accel/tcg/cpu-ldst.h index 1facabccb23a..bde3bd0425c9 100644 --- a/include/accel/tcg/cpu-ldst.h +++ b/include/accel/tcg/cpu-ldst.h @@ -423,52 +423,4 @@ cpu_stq_le_data(CPUArchState *env, abi_ptr addr, uint64_t val) cpu_stq_le_data_ra(env, addr, val, 0); } -#ifndef TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API -#if TARGET_BIG_ENDIAN -# define cpu_lduw_data cpu_lduw_be_data -# define cpu_ldsw_data cpu_ldsw_be_data -# define cpu_ldl_data cpu_ldl_be_data -# define cpu_ldq_data cpu_ldq_be_data -# define cpu_lduw_data_ra cpu_lduw_be_data_ra -# define cpu_ldsw_data_ra cpu_ldsw_be_data_ra -# define cpu_ldl_data_ra cpu_ldl_be_data_ra -# define cpu_ldq_data_ra cpu_ldq_be_data_ra -# define cpu_lduw_mmuidx_ra cpu_lduw_be_mmuidx_ra -# define cpu_ldsw_mmuidx_ra cpu_ldsw_be_mmuidx_ra -# define cpu_ldl_mmuidx_ra cpu_ldl_be_mmuidx_ra -# define cpu_ldq_mmuidx_ra cpu_ldq_be_mmuidx_ra -# define cpu_stw_data cpu_stw_be_data -# define cpu_stl_data cpu_stl_be_data -# define cpu_stq_data cpu_stq_be_data -# define cpu_stw_data_ra cpu_stw_be_data_ra -# define cpu_stl_data_ra cpu_stl_be_data_ra -# define cpu_stq_data_ra cpu_stq_be_data_ra -# define cpu_stw_mmuidx_ra cpu_stw_be_mmuidx_ra -# define cpu_stl_mmuidx_ra cpu_stl_be_mmuidx_ra -# define cpu_stq_mmuidx_ra cpu_stq_be_mmuidx_ra -#else -# define cpu_lduw_data cpu_lduw_le_data -# define cpu_ldsw_data cpu_ldsw_le_data -# define cpu_ldl_data cpu_ldl_le_data -# define cpu_ldq_data cpu_ldq_le_data -# define cpu_lduw_data_ra cpu_lduw_le_data_ra -# define cpu_ldsw_data_ra cpu_ldsw_le_data_ra -# define cpu_ldl_data_ra cpu_ldl_le_data_ra -# define cpu_ldq_data_ra cpu_ldq_le_data_ra -# define cpu_lduw_mmuidx_ra cpu_lduw_le_mmuidx_ra -# define cpu_ldsw_mmuidx_ra cpu_ldsw_le_mmuidx_ra -# define cpu_ldl_mmuidx_ra cpu_ldl_le_mmuidx_ra -# define cpu_ldq_mmuidx_ra cpu_ldq_le_mmuidx_ra -# define cpu_stw_data cpu_stw_le_data -# define cpu_stl_data cpu_stl_le_data -# define cpu_stq_data cpu_stq_le_data -# define cpu_stw_data_ra cpu_stw_le_data_ra -# define cpu_stl_data_ra cpu_stl_le_data_ra -# define cpu_stq_data_ra cpu_stq_le_data_ra -# define cpu_stw_mmuidx_ra cpu_stw_le_mmuidx_ra -# define cpu_stl_mmuidx_ra cpu_stl_le_mmuidx_ra -# define cpu_stq_mmuidx_ra cpu_stq_le_mmuidx_ra -#endif -#endif /* TARGET_NOT_USING_LEGACY_NATIVE_ENDIAN_API */ - #endif /* ACCEL_TCG_CPU_LDST_H */ -- 2.55.0
