From: Aurelien Jarno Date: Thu, 15 Jul 2010 21:13:11 +0000 (+0200) Subject: target-mips: fix xtlb exception for loongson X-Git-Tag: v0.13.0-rc0~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fc00a7bdeffd26932c4f27a6bc4f902f86fbbe9;p=thirdparty%2Fqemu.git target-mips: fix xtlb exception for loongson Loongson 2E and 2F use the same entry for xtlb and tlb exception, at offset 0x000. Signed-off-by: Aurelien Jarno --- diff --git a/target-mips/helper.c b/target-mips/helper.c index ea221ab53f1..de2ed7d2c76 100644 --- a/target-mips/helper.c +++ b/target-mips/helper.c @@ -491,7 +491,8 @@ void do_interrupt (CPUState *env) int SX = (env->CP0_Status & (1 << CP0St_SX)) != 0; int KX = (env->CP0_Status & (1 << CP0St_KX)) != 0; - if ((R == 0 && UX) || (R == 1 && SX) || (R == 3 && KX)) + if (((R == 0 && UX) || (R == 1 && SX) || (R == 3 && KX)) && + (!(env->insn_flags & (INSN_LOONGSON2E | INSN_LOONGSON2F)))) offset = 0x080; else #endif @@ -507,7 +508,8 @@ void do_interrupt (CPUState *env) int SX = (env->CP0_Status & (1 << CP0St_SX)) != 0; int KX = (env->CP0_Status & (1 << CP0St_KX)) != 0; - if ((R == 0 && UX) || (R == 1 && SX) || (R == 3 && KX)) + if (((R == 0 && UX) || (R == 1 && SX) || (R == 3 && KX)) && + (!(env->insn_flags & (INSN_LOONGSON2E | INSN_LOONGSON2F)))) offset = 0x080; else #endif