summaryrefslogtreecommitdiffstats
path: root/target/mips
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé2020-11-26 11:56:39 +0100
committerPhilippe Mathieu-Daudé2021-01-14 17:13:53 +0100
commit1ff668dde2378fb74a4ce590df8b4c5b2a735833 (patch)
tree242dd8af493708e322782d7601ad64a913174e8d /target/mips
parenttarget/mips: Convert Rel6 LDL/LDR/SDL/SDR opcodes to decodetree (diff)
downloadqemu-1ff668dde2378fb74a4ce590df8b4c5b2a735833.tar.gz
qemu-1ff668dde2378fb74a4ce590df8b4c5b2a735833.tar.xz
qemu-1ff668dde2378fb74a4ce590df8b4c5b2a735833.zip
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@amsat.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20201208203704.243704-13-f4bug@amsat.org>
Diffstat (limited to 'target/mips')
-rw-r--r--target/mips/mips64r6.decode3
-rw-r--r--target/mips/translate.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/target/mips/mips64r6.decode b/target/mips/mips64r6.decode
index 8ca352a5c1..b58d8009cc 100644
--- a/target/mips/mips64r6.decode
+++ b/target/mips/mips64r6.decode
@@ -22,3 +22,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 f0438ab9be..4db95c5588 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -28870,7 +28870,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:
@@ -28888,7 +28887,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);