From 71ca034a0dee69f77c8ac6ea7d21e5b6a0b0d836 Mon Sep 17 00:00:00 2001 From: Leon Alrae Date: Mon, 14 Sep 2015 13:58:23 +0100 Subject: target-mips: move the test for enabled interrupts to a separate function Signed-off-by: Leon Alrae --- target-mips/helper.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'target-mips/helper.c') diff --git a/target-mips/helper.c b/target-mips/helper.c index 01c4461573..2d86323911 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -759,7 +759,8 @@ bool mips_cpu_exec_interrupt(CPUState *cs, int interrupt_request) MIPSCPU *cpu = MIPS_CPU(cs); CPUMIPSState *env = &cpu->env; - if (cpu_mips_hw_interrupts_pending(env)) { + if (cpu_mips_hw_interrupts_enabled(env) && + cpu_mips_hw_interrupts_pending(env)) { /* Raise it */ cs->exception_index = EXCP_EXT_INTERRUPT; env->error_code = 0; -- cgit 1.4.1 From 60270f85cc93d2d34e45b7679c374b1d771f0eeb Mon Sep 17 00:00:00 2001 From: Yongbok Kim Date: Thu, 29 Oct 2015 17:17:52 +0000 Subject: 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 Reviewed-by: James Hogan Reviewed-by: Leon Alrae Signed-off-by: Leon Alrae --- target-mips/helper.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'target-mips/helper.c') 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; -- cgit 1.4.1