[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 36/60] target/s390x: Use probe_access_flags in s390_probe_access
From: |
Richard Henderson |
Subject: |
[PULL 36/60] target/s390x: Use probe_access_flags in s390_probe_access |
Date: |
Tue, 2 Nov 2021 07:07:16 -0400 |
Not sure why the user-only code wasn't rewritten to use
probe_access_flags at the same time that the sysemu code
was converted. For the purpose of user-only, this is an
exact replacement.
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/s390x/tcg/mem_helper.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index 17e3f83641..362a30d99e 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -141,20 +141,12 @@ static int s390_probe_access(CPUArchState *env,
target_ulong addr, int size,
MMUAccessType access_type, int mmu_idx,
bool nonfault, void **phost, uintptr_t ra)
{
+#if defined(CONFIG_USER_ONLY)
+ return probe_access_flags(env, addr, access_type, mmu_idx,
+ nonfault, phost, ra);
+#else
int flags;
-#if defined(CONFIG_USER_ONLY)
- flags = page_get_flags(addr);
- if (!(flags & (access_type == MMU_DATA_LOAD ? PAGE_READ :
PAGE_WRITE_ORG))) {
- env->__excp_addr = addr;
- flags = (flags & PAGE_VALID) ? PGM_PROTECTION : PGM_ADDRESSING;
- if (nonfault) {
- return flags;
- }
- tcg_s390_program_interrupt(env, flags, ra);
- }
- *phost = g2h(env_cpu(env), addr);
-#else
/*
* For !CONFIG_USER_ONLY, we cannot rely on TLB_INVALID_MASK or haddr==NULL
* to detect if there was an exception during tlb_fill().
@@ -173,8 +165,8 @@ static int s390_probe_access(CPUArchState *env,
target_ulong addr, int size,
(access_type == MMU_DATA_STORE
? BP_MEM_WRITE : BP_MEM_READ), ra);
}
-#endif
return 0;
+#endif
}
static int access_prepare_nf(S390Access *access, CPUS390XState *env,
--
2.25.1
- [PULL 34/60] target/ppc: Implement ppc_cpu_record_sigsegv, (continued)
- [PULL 34/60] target/ppc: Implement ppc_cpu_record_sigsegv, Richard Henderson, 2021/11/02
- [PULL 07/60] linux-user/host/x86: Populate host_signal.h, Richard Henderson, 2021/11/02
- [PULL 09/60] linux-user/host/alpha: Populate host_signal.h, Richard Henderson, 2021/11/02
- [PULL 13/60] linux-user/host/s390: Populate host_signal.h, Richard Henderson, 2021/11/02
- [PULL 20/60] linux-user: Add cpu_loop_exit_sigsegv, Richard Henderson, 2021/11/02
- [PULL 11/60] linux-user/host/arm: Populate host_signal.h, Richard Henderson, 2021/11/02
- [PULL 18/60] linux-user/signal: Drop HOST_SIGNAL_PLACEHOLDER, Richard Henderson, 2021/11/02
- [PULL 26/60] target/hppa: Make hppa_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 16/60] target/arm: Fixup comment re handle_cpu_signal, Richard Henderson, 2021/11/02
- [PULL 37/60] target/s390x: Implement s390_cpu_record_sigsegv, Richard Henderson, 2021/11/02
- [PULL 36/60] target/s390x: Use probe_access_flags in s390_probe_access,
Richard Henderson <=
- [PULL 29/60] target/microblaze: Make mb_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 39/60] target/sparc: Make sparc_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 14/60] linux-user/host/mips: Populate host_signal.h, Richard Henderson, 2021/11/02
- [PULL 33/60] target/openrisc: Make openrisc_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 40/60] target/xtensa: Make xtensa_cpu_tlb_fill sysemu only, Richard Henderson, 2021/11/02
- [PULL 42/60] hw/core: Add TCGCPUOps.record_sigbus, Richard Henderson, 2021/11/02
- [PULL 45/60] target/arm: Implement arm_cpu_record_sigbus, Richard Henderson, 2021/11/02
- [PULL 44/60] target/alpha: Implement alpha_cpu_record_sigbus, Richard Henderson, 2021/11/02
- [PULL 43/60] linux-user: Add cpu_loop_exit_sigbus, Richard Henderson, 2021/11/02
- [PULL 46/60] linux-user/hppa: Remove EXCP_UNALIGN handling, Richard Henderson, 2021/11/02