Skip to content
Snippets Groups Projects
Commit 067aa95c authored by Helge Deller's avatar Helge Deller Committed by Michael Tokarev
Browse files

target/hppa: Fix IOR and ISR on error in probe


Put correct values (depending on CPU arch) into IOR and ISR on fault.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
(cherry picked from commit 31efbe72c6cc54b9cbc2505d78870a8a87a8d392)
Signed-off-by: default avatarMichael Tokarev <mjt@tls.msk.ru>
parent abf489be
No related branches found
No related tags found
No related merge requests found
......@@ -351,11 +351,7 @@ target_ulong HELPER(probe)(CPUHPPAState *env, target_ulong addr,
excp = hppa_get_physical_address(env, addr, mmu_idx, 0, &phys,
&prot, NULL);
if (excp >= 0) {
if (env->psw & PSW_Q) {
/* ??? Needs tweaking for hppa64. */
env->cr[CR_IOR] = addr;
env->cr[CR_ISR] = addr >> 32;
}
hppa_set_ior_and_isr(env, addr, MMU_IDX_MMU_DISABLED(mmu_idx));
if (excp == EXCP_DTLB_MISS) {
excp = EXCP_NA_DTLB_MISS;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment