Peter Maydell <peter.mayd...@linaro.org> writes:
> Instead of using the _raw family of ld/st accessor functions, use
> cpu_*_data. All this code is CONFIG_USER_ONLY, so the two are the
> same semantically, but the _raw functions are really a detail of
> the implementation which has leaked into a few callsites like this one.
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> target-sparc/ldst_helper.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c
> index 1a62e19..e62228c 100644
> --- a/target-sparc/ldst_helper.c
> +++ b/target-sparc/ldst_helper.c
> @@ -1122,17 +1122,17 @@ uint64_t helper_ld_asi(CPUSPARCState *env,
> target_ulong addr, int asi, int size,
> {
> switch (size) {
> case 1:
> - ret = ldub_raw(addr);
> + ret = cpu_ldub_data(env, addr);
> break;
> case 2:
> - ret = lduw_raw(addr);
> + ret = cpu_lduw_data(env, addr);
> break;
> case 4:
> - ret = ldl_raw(addr);
> + ret = cpu_ldl_data(env, addr);
> break;
> default:
> case 8:
> - ret = ldq_raw(addr);
> + ret = cpu_ldq_data(env, addr);
> break;
> }
> }
> @@ -1239,17 +1239,17 @@ void helper_st_asi(CPUSPARCState *env, target_ulong
> addr, target_ulong val,
> {
> switch (size) {
> case 1:
> - stb_raw(addr, val);
> + cpu_stb_data(env, addr, val);
> break;
> case 2:
> - stw_raw(addr, val);
> + cpu_stw_data(env, addr, val);
> break;
> case 4:
> - stl_raw(addr, val);
> + cpu_stl_data(env, addr, val);
> break;
> case 8:
> default:
> - stq_raw(addr, val);
> + cpu_stq_data(env, addr, val);
> break;
> }
> }
> @@ -2289,8 +2289,8 @@ void helper_ldqf(CPUSPARCState *env, target_ulong addr,
> int mem_idx)
> break;
> }
> #else
> - u.ll.upper = ldq_raw(address_mask(env, addr));
> - u.ll.lower = ldq_raw(address_mask(env, addr + 8));
> + u.ll.upper = cpu_ldq_data(env, address_mask(env, addr));
> + u.ll.lower = cpu_ldq_data(env, address_mask(env, addr + 8));
> QT0 = u.q;
> #endif
> }
> @@ -2326,8 +2326,8 @@ void helper_stqf(CPUSPARCState *env, target_ulong addr,
> int mem_idx)
> }
> #else
> u.q = QT0;
> - stq_raw(address_mask(env, addr), u.ll.upper);
> - stq_raw(address_mask(env, addr + 8), u.ll.lower);
> + cpu_stq_data(env, address_mask(env, addr), u.ll.upper);
> + cpu_stq_data(env, address_mask(env, addr + 8), u.ll.lower);
> #endif
> }
--
Alex Bennée
