From ce3aecf263acda8a34de592ba4fecd601d9d9058 Mon Sep 17 00:00:00 2001 From: Yongbok Kim Date: Fri, 2 Mar 2018 14:15:41 -0500 Subject: [PATCH] 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 Backports commit 075a1fe788d36b271ec25507466c30b9a90b5d54 from qemu --- qemu/target/mips/translate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu/target/mips/translate.c b/qemu/target/mips/translate.c index 4b37de74..c5dfe0ce 100644 --- a/qemu/target/mips/translate.c +++ b/qemu/target/mips/translate.c @@ -18263,7 +18263,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; }