diff options
| author | Philippe Mathieu-Daudé | 2020-11-26 11:59:21 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2021-01-14 17:13:53 +0100 |
| commit | 27ea1bc077298ce00cde57050875c48ad1ceab7f (patch) | |
| tree | 1562c3d68eff657c5eba33cd96d368439d6c9cd9 | |
| parent | target/mips: Convert Rel6 LLD/SCD opcodes to decodetree (diff) | |
| download | qemu-27ea1bc077298ce00cde57050875c48ad1ceab7f.tar.gz qemu-27ea1bc077298ce00cde57050875c48ad1ceab7f.tar.xz qemu-27ea1bc077298ce00cde57050875c48ad1ceab7f.zip | |
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é <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201208203704.243704-14-f4bug@amsat.org>
| -rw-r--r-- | target/mips/mips32r6.decode | 2 | ||||
| -rw-r--r-- | target/mips/translate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/mips/mips32r6.decode b/target/mips/mips32r6.decode index 0b5befccc8..837c991edc 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 4db95c5588..a5cf1742a8 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); } |