From 6212fb2dc79e435384d1bd98fa1b25bcc2c0a006 Mon Sep 17 00:00:00 2001 From: Yongbok Kim Date: Sat, 17 Feb 2018 14:46:10 -0500 Subject: [PATCH] target-mips: fix updating XContext on mmu exception Correct updating XContext.Region field on mmu exceptions. If Config3.CTXTC = 0 then the R field of XContext has to be updated with the value of bits 63..62 of the virtual address upon a TLB exception. Also fixed the below line which overs 80 characters. Backports commit 60270f85cc93d2d34e45b7679c374b1d771f0eeb from qemu --- qemu/target-mips/helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qemu/target-mips/helper.c b/qemu/target-mips/helper.c index e5d79aca..8a52373a 100644 --- a/qemu/target-mips/helper.c +++ b/qemu/target-mips/helper.c @@ -281,9 +281,10 @@ static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, (env->CP0_EntryHi & 0xFF) | (address & (TARGET_PAGE_MASK << 1)); #if defined(TARGET_MIPS64) env->CP0_EntryHi &= env->SEGMask; - env->CP0_XContext = (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) | - ((address & 0xC00000000000ULL) >> (55 - env->SEGBITS)) | - ((address & ((1ULL << env->SEGBITS) - 1) & 0xFFFFFFFFFFFFE000ULL) >> 9); + env->CP0_XContext = + /* PTEBase */ (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) | + /* R */ (extract64(address, 62, 2) << (env->SEGBITS - 9)) | + /* BadVPN2 */ (extract64(address, 13, env->SEGBITS - 13) << 4); #endif cs->exception_index = exception; env->error_code = error_code;