diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-11-07 13:30:27 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-11-13 09:17:07 -0800 |
| commit | 576fc9376d7f220a21807bd7759d297acb4b6072 (patch) | |
| tree | 1f8419b48b4b163d90539eb991ba2af86db9877c | |
| parent | e5d487c9724e0fc62b1afca9f8ea11fd072643a8 (diff) | |
| download | qemu-576fc9376d7f220a21807bd7759d297acb4b6072.zip qemu-576fc9376d7f220a21807bd7759d297acb4b6072.tar.gz qemu-576fc9376d7f220a21807bd7759d297acb4b6072.tar.bz2 | |
target/hppa: Use PRIV_P_TO_MMU_IDX in helper_probe
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>
| -rw-r--r-- | target/hppa/op_helper.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index a0e31c0..7f607c3 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -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); @@ -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) { |