SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/hppa: Use PRIV_P_TO_MMU_IDX in helper_probe

Browse Source 
Direct privilege level to mmu_idx mapping has been
false for some time.  Provide the correct value to
hppa_get_physical_address.

Fixes: fa824d99f9b ("target/hppa: Switch to use MMU indices 11-15")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2023-11-07 13:30:27 -08:00
parent e5d487c972
commit 576fc9376d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/hppa/op_helper.c
View File

@ -338,7 +338,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
return page_check_range(addr, 1, want); return page_check_range(addr, 1, want);
#else #else
int prot, excp; int prot, excp, mmu_idx;
hwaddr phys; hwaddr phys;
trace_hppa_tlb_probe(addr, level, want); trace_hppa_tlb_probe(addr, level, want);
@ -347,7 +347,8 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
return 0; return 0;
} }
excp = hppa_get_physical_address(env, addr, level, 0, &phys, mmu_idx = PRIV_P_TO_MMU_IDX(level, env->psw & PSW_P);
excp = hppa_get_physical_address(env, addr, mmu_idx, 0, &phys,
&prot, NULL); &prot, NULL);
if (excp >= 0) { if (excp >= 0) {
if (env->psw & PSW_Q) { if (env->psw & PSW_Q) {