[PULL 64/66] target/mips: Convert Rel6 LLD/SCD opcodes to decodetree

LLD/SCD 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é <f4bug(a)amsat.org&gt; Reviewed-by: Richard Henderson <richard.henderson(a)linaro.org&gt; Message-Id: <20201208203704.243704-13-f4bug(a)amsat.org&gt; --- target/mips/mips64r6.decode | 3 +++ target/mips/translate.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/mips/mips64r6.decode b/target/mips/mips64r6.decode index 8c3fc5dae9c..609b8958d25 100644 --- a/target/mips/mips64r6.decode +++ b/target/mips/mips64r6.decode @@ -21,3 +21,6 @@ REMOVED 011010 ----- ----- ---------------- # LDL REMOVED 011011 ----- ----- ---------------- # LDR REMOVED 101100 ----- ----- ---------------- # SDL REMOVED 101101 ----- ----- ---------------- # SDR + +REMOVED 110100 ----- ----- ---------------- # LLD +REMOVED 111100 ----- ----- ---------------- # SCD diff --git a/target/mips/translate.c b/target/mips/translate.c index f46d7c5f80b..9f717aab287 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28871,7 +28871,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); /* fall through */ case OPC_LDL: case OPC_LDR: @@ -28889,7 +28888,6 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx) gen_st(ctx, op, rt, rs, imm); break; case OPC_SCD: - check_insn_opc_removed(ctx, ISA_MIPS_R6); check_insn(ctx, ISA_MIPS3); if (ctx->insn_flags & INSN_R5900) { check_insn_opc_user_only(ctx, INSN_R5900); -- 2.26.2