From: Philippe Mathieu-Daudé Date: Thu, 26 Nov 2020 10:59:21 +0000 (+0100) Subject: target/mips: Convert Rel6 LL/SC opcodes to decodetree X-Git-Tag: v6.0.0-rc0~147^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27ea1bc077298ce00cde57050875c48ad1ceab7f;p=thirdparty%2Fqemu.git target/mips: Convert Rel6 LL/SC opcodes to decodetree LL/SC 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-14-f4bug@amsat.org> --- diff --git a/target/mips/mips32r6.decode b/target/mips/mips32r6.decode index 0b5befccc80..837c991edc5 100644 --- a/target/mips/mips32r6.decode +++ b/target/mips/mips32r6.decode @@ -31,4 +31,6 @@ REMOVED 101010 ----- ----- ---------------- # SWL REMOVED 101110 ----- ----- ---------------- # SWR REMOVED 101111 ----- ----- ---------------- # CACHE +REMOVED 110000 ----- ----- ---------------- # LL REMOVED 110011 ----- ----- ---------------- # PREF +REMOVED 111000 ----- ----- ---------------- # SC diff --git a/target/mips/translate.c b/target/mips/translate.c index 4db95c55881..a5cf1742a8b 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28584,7 +28584,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) if (ctx->insn_flags & INSN_R5900) { check_insn_opc_user_only(ctx, INSN_R5900); } - check_insn_opc_removed(ctx, ISA_MIPS_R6); /* Fallthrough */ case OPC_LWL: case OPC_LWR: @@ -28605,7 +28604,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) break; case OPC_SC: check_insn(ctx, ISA_MIPS2); - check_insn_opc_removed(ctx, ISA_MIPS_R6); if (ctx->insn_flags & INSN_R5900) { check_insn_opc_user_only(ctx, INSN_R5900); }