Skip to content

Commit

Permalink
target/hppa: Use PRIV_P_TO_MMU_IDX in helper_probe
Browse files Browse the repository at this point in the history
Direct privilege level to mmu_idx mapping has been
false for some time.  Provide the correct value to
hppa_get_physical_address.

Fixes: fa824d9 ("target/hppa: Switch to use MMU indices 11-15")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
  • Loading branch information
rth7680 committed Nov 13, 2023
1 parent e5d487c commit 576fc93
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions target/hppa/op_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
#ifdef CONFIG_USER_ONLY
return page_check_range(addr, 1, want);
#else
int prot, excp;
int prot, excp, mmu_idx;
hwaddr phys;

trace_hppa_tlb_probe(addr, level, want);
Expand All @@ -347,7 +347,8 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
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);
if (excp >= 0) {
if (env->psw & PSW_Q) {
Expand Down

0 comments on commit 576fc93

Please sign in to comment.