The macros laddr() and saddr() are always defined to be identical to each other. Replace them with a single macro, and give it a longer name so it's easier to grep the codebase and confirm that it's only used in this one place: ldst_get_host_addr().
Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> --- include/exec/cpu_ldst.h | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h index 4700831..0aae9e4 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h @@ -53,30 +53,31 @@ h2g_nocheck(x); \ }) -#define saddr(x) g2h(x) -#define laddr(x) g2h(x) +#define ldst_get_host_addr(x) g2h(x) #else /* !CONFIG_USER_ONLY */ /* NOTE: we use double casts if pointers and target_ulong have different sizes */ -#define saddr(x) (uint8_t *)(intptr_t)(x) -#define laddr(x) (uint8_t *)(intptr_t)(x) +#define ldst_get_host_addr(x) (uint8_t *)(intptr_t)(x) #endif -#define ldub_raw(p) ldub_p(laddr((p))) -#define ldsb_raw(p) ldsb_p(laddr((p))) -#define lduw_raw(p) lduw_p(laddr((p))) -#define ldsw_raw(p) ldsw_p(laddr((p))) -#define ldl_raw(p) ldl_p(laddr((p))) -#define ldq_raw(p) ldq_p(laddr((p))) -#define ldfl_raw(p) ldfl_p(laddr((p))) -#define ldfq_raw(p) ldfq_p(laddr((p))) -#define stb_raw(p, v) stb_p(saddr((p)), v) -#define stw_raw(p, v) stw_p(saddr((p)), v) -#define stl_raw(p, v) stl_p(saddr((p)), v) -#define stq_raw(p, v) stq_p(saddr((p)), v) -#define stfl_raw(p, v) stfl_p(saddr((p)), v) -#define stfq_raw(p, v) stfq_p(saddr((p)), v) +/* Note that ldst_get_host_addr() should not be used anywhere outside + * these macros + */ +#define ldub_raw(p) ldub_p(ldst_get_host_addr(p)) +#define ldsb_raw(p) ldsb_p(ldst_get_host_addr(p)) +#define lduw_raw(p) lduw_p(ldst_get_host_addr(p)) +#define ldsw_raw(p) ldsw_p(ldst_get_host_addr(p)) +#define ldl_raw(p) ldl_p(ldst_get_host_addr(p)) +#define ldq_raw(p) ldq_p(ldst_get_host_addr(p)) +#define ldfl_raw(p) ldfl_p(ldst_get_host_addr(p)) +#define ldfq_raw(p) ldfq_p(ldst_get_host_addr(p)) +#define stb_raw(p, v) stb_p(ldst_get_host_addr(p), v) +#define stw_raw(p, v) stw_p(ldst_get_host_addr(p), v) +#define stl_raw(p, v) stl_p(ldst_get_host_addr(p), v) +#define stq_raw(p, v) stq_p(ldst_get_host_addr(p), v) +#define stfl_raw(p, v) stfl_p(ldst_get_host_addr(p), v) +#define stfq_raw(p, v) stfq_p(ldst_get_host_addr(p), v) #if defined(CONFIG_USER_ONLY) -- 1.9.1