target-mips: CP0_Status.CU0 no longer allows the user to access CP0

Leon Alrae · Leon Alrae · commit a63eb0ce0f5c · 2014-11-03T11:48:34.000Z
Signed-off-by: Leon Alrae &lt;leon.alrae@imgtec.com&gt;
Reviewed-by: Yongbok Kim &lt;yongbok.kim@imgtec.com&gt;
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
@@ -790,7 +790,8 @@ static inline void compute_hflags(CPUMIPSState *env)
         }
     }
 #endif
-    if ((env->CP0_Status & (1 << CP0St_CU0)) ||
+    if (((env->CP0_Status & (1 << CP0St_CU0)) &&
+         !(env->insn_flags & ISA_MIPS32R6)) ||
         !(env->hflags & MIPS_HFLAG_KSU)) {
         env->hflags |= MIPS_HFLAG_CP0;
     }

Original file line number	Diff line number	Diff line change
`@@ -790,7 +790,8 @@ static inline void compute_hflags(CPUMIPSState *env)`
`790`	`790`	`}`
`791`	`791`	`}`
`792`	`792`	`#endif`
`793`		`- if ((env->CP0_Status & (1 << CP0St_CU0)) \|\|`
	`793`	`+ if (((env->CP0_Status & (1 << CP0St_CU0)) &&`
	`794`	`+ !(env->insn_flags & ISA_MIPS32R6)) \|\|`
`794`	`795`	`!(env->hflags & MIPS_HFLAG_KSU)) {`
`795`	`796`	`env->hflags \|= MIPS_HFLAG_CP0;`
`796`	`797`	`}`