]> git.proxmox.com Git - mirror_qemu.git/commitdiff
target/mips: fix delay slot detection in gen_msa_branch()
authorYongbok Kim <yongbok.kim@imgtec.com>
Tue, 7 Mar 2017 15:37:34 +0000 (15:37 +0000)
committerYongbok Kim <yongbok.kim@imgtec.com>
Mon, 20 Mar 2017 11:19:14 +0000 (11:19 +0000)
It is unnecessary to test R6 from delay/forbidden slot check
in gen_msa_branch().

https://bugs.launchpad.net/qemu/+bug/1663287

Reported-by: Brian Campbell <bacam@z273.org.uk>
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
target/mips/translate.c

index 78b7264addcf803a56d5755de537155fc2762f04..3022f349cb2a06e428deb5d5dd6e90810c7c0ced 100644 (file)
@@ -18162,7 +18162,7 @@ static void gen_msa_branch(CPUMIPSState *env, DisasContext *ctx, uint32_t op1)
 
     check_msa_access(ctx);
 
-    if (ctx->insn_flags & ISA_MIPS32R6 && ctx->hflags & MIPS_HFLAG_BMASK) {
+    if (ctx->hflags & MIPS_HFLAG_BMASK) {
         generate_exception_end(ctx, EXCP_RI);
         return;
     }