target/s390x: Use probe_access_flags in s390_probe_access
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>
This commit is contained in:
parent
263e2ab20c
commit
db9aab5783
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue