diff options
| author | Yongbok Kim <yongbok.kim@imgtec.com> | 2015-10-29 17:17:52 +0000 |
|---|---|---|
| committer | Leon Alrae <leon.alrae@imgtec.com> | 2015-10-30 14:36:19 +0000 |
| commit | 60270f85cc93d2d34e45b7679c374b1d771f0eeb (patch) | |
| tree | fa7bd832b6c0b3980e34e24eb014eadd3ec30395 | |
| parent | bb238210bb096534b68dab15a87c6ff0bef43672 (diff) | |
| download | focaccia-qemu-60270f85cc93d2d34e45b7679c374b1d771f0eeb.tar.gz focaccia-qemu-60270f85cc93d2d34e45b7679c374b1d771f0eeb.zip | |
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. Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com> Reviewed-by: James Hogan <james.hogan@imgtec.com> Reviewed-by: Leon Alrae <leon.alrae@imgtec.com> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
| -rw-r--r-- | target-mips/helper.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/target-mips/helper.c b/target-mips/helper.c index 2d86323911..b3fe816fec 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -293,9 +293,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; |