Message ID | 20201208203704.243704-14-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Series | target/mips: Convert LSA/DLSA and part of the Rel6 removed opcodes | expand |
On 12/8/20 2:37 PM, Philippe Mathieu-Daudé wrote: > 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é <f4bug@amsat.org> > --- > target/mips/isa-mips32r6.decode | 2 ++ > target/mips/translate.c | 2 -- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/mips/isa-mips32r6.decode b/target/mips/isa-mips32r6.decode index 3ec50704cf2..489c20aa4e9 100644 --- a/target/mips/isa-mips32r6.decode +++ b/target/mips/isa-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 009301c9ceb..90a6dfcd2b3 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -28632,7 +28632,6 @@ static void decode_opc(CPUMIPSState *env, DisasContext *ctx) if (ctx->insn_flags & INSN_R5900) { check_insn_opc_user_only(ctx, INSN_R5900); } - check_insn_opc_removed(ctx, ISA_MIPS32R6); /* Fallthrough */ case OPC_LWL: case OPC_LWR: @@ -28653,7 +28652,6 @@ static void decode_opc(CPUMIPSState *env, DisasContext *ctx) break; case OPC_SC: check_insn(ctx, ISA_MIPS2); - check_insn_opc_removed(ctx, ISA_MIPS32R6); if (ctx->insn_flags & INSN_R5900) { check_insn_opc_user_only(ctx, INSN_R5900); }
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é <f4bug@amsat.org> --- target/mips/isa-mips32r6.decode | 2 ++ target/mips/translate.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)