From: Philippe Mathieu-Daudé Date: Thu, 26 Nov 2020 10:55:46 +0000 (+0100) Subject: target/mips: Convert Rel6 CACHE/PREF opcodes to decodetree X-Git-Tag: v6.0.0-rc0~147^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6513ca15d8f4034bbc1b68a2cae4f54858fab61e;p=thirdparty%2Fqemu.git target/mips: Convert Rel6 CACHE/PREF opcodes to decodetree CACHE/PREF opcodes have been removed from the Release 6. Add a single decodetree entry for the opcodes, triggering Reserved Instruction if ever used. Remove unreachable check_insn_opc_removed() calls. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20201208203704.243704-9-f4bug@amsat.org> --- diff --git a/target/mips/mips32r6.decode b/target/mips/mips32r6.decode index aea6f1142ae..543e0c77bb9 100644 --- a/target/mips/mips32r6.decode +++ b/target/mips/mips32r6.decode @@ -19,3 +19,6 @@ LSA 000000 ..... ..... ..... 000 .. 000101 @lsa REMOVED 010011 ----- ----- ----- ----- ------ # COP1X (COP3) REMOVED 011100 ----- ----- ----- ----- ------ # SPECIAL2 + +REMOVED 101111 ----- ----- ---------------- # CACHE +REMOVED 110011 ----- ----- ---------------- # PREF diff --git a/target/mips/translate.c b/target/mips/translate.c index f3ebac9b8c6..381571e45b9 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28619,7 +28619,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) gen_st_cond(ctx, rt, rs, imm, MO_TESL, false); break; case OPC_CACHE: - check_insn_opc_removed(ctx, ISA_MIPS_R6); check_cp0_enabled(ctx); check_insn(ctx, ISA_MIPS3 | ISA_MIPS_R1); if (ctx->hflags & MIPS_HFLAG_ITC_CACHE) { @@ -28628,7 +28627,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) /* Treat as NOP. */ break; case OPC_PREF: - check_insn_opc_removed(ctx, ISA_MIPS_R6); if (ctx->insn_flags & INSN_R5900) { /* Treat as NOP. */ } else {