Commit 60270f85 authored by Yongbok Kim's avatar Yongbok Kim Committed by Leon Alrae
Browse files

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: default avatarYongbok Kim <yongbok.kim@imgtec.com>
Reviewed-by: default avatarJames Hogan <james.hogan@imgtec.com>
Reviewed-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
Signed-off-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
parent bb238210

target-mips/helper.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -293,9 +293,10 @@ static void raise_mmu_exception(CPUMIPSState *env, target_ulong address, 
        (env->CP0_EntryHi & 0xFF) | (address & (TARGET_PAGE_MASK << 1));

        (env->CP0_EntryHi & 0xFF) | (address & (TARGET_PAGE_MASK << 1));

#if defined(TARGET_MIPS64)

#if defined(TARGET_MIPS64)

    env->CP0_EntryHi &= env->SEGMask;

    env->CP0_EntryHi &= env->SEGMask;

    env->CP0_XContext = (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) |

    env->CP0_XContext =

                        ((address & 0xC00000000000ULL) >> (55 - env->SEGBITS)) |

        /* PTEBase */   (env->CP0_XContext & ((~0ULL) << (env->SEGBITS - 7))) |

                        ((address & ((1ULL << env->SEGBITS) - 1) & 0xFFFFFFFFFFFFE000ULL) >> 9);

        /* R */         (extract64(address, 62, 2) << (env->SEGBITS - 9)) |

        /* BadVPN2 */   (extract64(address, 13, env->SEGBITS - 13) << 4);

#endif

#endif

    cs->exception_index = exception;

    cs->exception_index = exception;

    env->error_code = error_code;

    env->error_code = error_code;