From: Yongbok Kim <yongbok.kim@imgtec.com>
Date: Tue, 7 Mar 2017 15:37:34 +0000 (+0000)
Subject: target/mips: fix delay slot detection in gen_msa_branch()
X-Git-Tag: v2.9.0-rc2~30^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=075a1fe788d36b271ec25507466c30b9a90b5d54;p=mirror_qemu.git

target/mips: fix delay slot detection in gen_msa_branch()

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>
---

diff --git a/target/mips/translate.c b/target/mips/translate.c
index 78b7264add..3022f349cb 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -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;
     }