From 24c7b0e330fdbfcfe87f515d79e67156c57cbc4f Mon Sep 17 00:00:00 2001 From: ths Date: Fri, 30 Mar 2007 16:44:54 +0000 Subject: Sanitize mips exception handling. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2546 c046a42c-6fe2-441c-8c8c-71466251a162 --- cpu-exec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpu-exec.c') diff --git a/cpu-exec.c b/cpu-exec.c index d124c4059b..d168886620 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -461,10 +461,10 @@ int cpu_exec(CPUState *env1) } #elif defined(TARGET_MIPS) if ((interrupt_request & CPU_INTERRUPT_HARD) && + (env->CP0_Status & env->CP0_Cause & CP0Ca_IP_mask) && (env->CP0_Status & (1 << CP0St_IE)) && - (env->CP0_Status & env->CP0_Cause & 0x0000FF00) && - !(env->hflags & MIPS_HFLAG_EXL) && - !(env->hflags & MIPS_HFLAG_ERL) && + !(env->CP0_Status & (1 << CP0St_EXL)) && + !(env->CP0_Status & (1 << CP0St_ERL)) && !(env->hflags & MIPS_HFLAG_DM)) { /* Raise it */ env->exception_index = EXCP_EXT_INTERRUPT; -- cgit 1.4.1