From ddc7ef8dfe2408912832ddaac2a21ede4300ce22 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Tue, 24 Nov 2020 11:53:46 +0100 Subject: [PATCH] target/mips: Convert Rel6 COP1X opcode to decodetree MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit COP1x opcode has been removed from the Release 6. Add a single decodetree entry for it, triggering Reserved Instruction if ever used. Remove unreachable check_insn_opc_removed() call. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20201208203704.243704-8-f4bug@amsat.org> --- target/mips/mips32r6.decode | 2 ++ target/mips/translate.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/mips/mips32r6.decode b/target/mips/mips32r6.decode index dd7faf75ab..aea6f1142a 100644 --- a/target/mips/mips32r6.decode +++ b/target/mips/mips32r6.decode @@ -16,4 +16,6 @@ LSA 000000 ..... ..... ..... 000 .. 000101 @lsa +REMOVED 010011 ----- ----- ----- ----- ------ # COP1X (COP3) + REMOVED 011100 ----- ----- ----- ----- ------ # SPECIAL2 diff --git a/target/mips/translate.c b/target/mips/translate.c index 2f23ce4a36..f3ebac9b8c 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28826,7 +28826,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_CP3: - check_insn_opc_removed(ctx, ISA_MIPS_R6); if (ctx->CP0_Config1 & (1 << CP0C1_FP)) { check_cp1_enabled(ctx); op1 = MASK_CP3(ctx->opcode); -- 2.30.2