Prefer the address_space_ld/st API over the legacy ld_phys() because it allow checking for bus access fault. This code however doesn't check for fault, so we simply inline the calls (not specifying any memory transaction attribute nor expecting transation result). No logical change intended.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/s390x/tcg/excp_helper.c | 21 +++++++++++++-------- target/s390x/tcg/mem_helper.c | 12 +++++++----- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/target/s390x/tcg/excp_helper.c b/target/s390x/tcg/excp_helper.c index 41b0017d767..05e448d3f20 100644 --- a/target/s390x/tcg/excp_helper.c +++ b/target/s390x/tcg/excp_helper.c @@ -54,8 +54,9 @@ G_NORETURN void tcg_s390_data_exception(CPUS390XState *env, uint32_t dxc, g_assert(dxc <= 0xff); #if !defined(CONFIG_USER_ONLY) /* Store the DXC into the lowcore */ - stl_be_phys(env_cpu(env)->as, - env->psa + offsetof(LowCore, data_exc_code), dxc); + address_space_stl_be(env_cpu(env)->as, + env->psa + offsetof(LowCore, data_exc_code), dxc, + MEMTXATTRS_UNSPECIFIED, NULL); #endif /* Store the DXC into the FPC if AFP is enabled */ @@ -71,8 +72,9 @@ G_NORETURN void tcg_s390_vector_exception(CPUS390XState *env, uint32_t vxc, g_assert(vxc <= 0xff); #if !defined(CONFIG_USER_ONLY) /* Always store the VXC into the lowcore, without AFP it is undefined */ - stl_be_phys(env_cpu(env)->as, - env->psa + offsetof(LowCore, data_exc_code), vxc); + address_space_stl_be(env_cpu(env)->as, + env->psa + offsetof(LowCore, data_exc_code), vxc, + MEMTXATTRS_UNSPECIFIED, NULL); #endif /* Always store the VXC into the FPC, without AFP it is undefined */ @@ -619,11 +621,14 @@ void monitor_event(CPUS390XState *env, uint64_t monitor_code, uint8_t monitor_class, uintptr_t ra) { + const MemTxAttrs attrs = MEMTXATTRS_UNSPECIFIED; + AddressSpace *as = env_cpu(env)->as; + /* Store the Monitor Code and the Monitor Class Number into the lowcore */ - stq_be_phys(env_cpu(env)->as, - env->psa + offsetof(LowCore, monitor_code), monitor_code); - stw_be_phys(env_cpu(env)->as, - env->psa + offsetof(LowCore, mon_class_num), monitor_class); + address_space_stq_be(as, env->psa + offsetof(LowCore, monitor_code), + monitor_code, attrs, NULL); + address_space_stw_be(as, env->psa + offsetof(LowCore, mon_class_num), + monitor_class, attrs, NULL); tcg_s390_program_interrupt(env, PGM_MONITOR, ra); } diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c index 2a79a789f63..8474a694110 100644 --- a/target/s390x/tcg/mem_helper.c +++ b/target/s390x/tcg/mem_helper.c @@ -41,6 +41,7 @@ #else #include "hw/s390x/storage-keys.h" #include "hw/core/boards.h" +#include "system/memory.h" #endif #ifdef CONFIG_USER_ONLY @@ -958,13 +959,14 @@ uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint32_t r1, uint32_t r2) inject_exc: #if !defined(CONFIG_USER_ONLY) if (exc != PGM_ADDRESSING) { - stq_be_phys(env_cpu(env)->as, - env->psa + offsetof(LowCore, trans_exc_code), - env->tlb_fill_tec); + address_space_stq_be(env_cpu(env)->as, + env->psa + offsetof(LowCore, trans_exc_code), + env->tlb_fill_tec, MEMTXATTRS_UNSPECIFIED, NULL); } if (exc == PGM_PAGE_TRANS) { - stb_phys(env_cpu(env)->as, env->psa + offsetof(LowCore, op_access_id), - r1 << 4 | r2); + address_space_stb(env_cpu(env)->as, + env->psa + offsetof(LowCore, op_access_id), + r1 << 4 | r2, MEMTXATTRS_UNSPECIFIED, NULL); } #endif tcg_s390_program_interrupt(env, exc, ra); -- 2.53.0
