[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/13] target/mips: Convert Rel6 LWL/LWR/SWL/SWR opcodes to decod
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 09/13] target/mips: Convert Rel6 LWL/LWR/SWL/SWR opcodes to decodetree |
Date: |
Tue, 8 Dec 2020 21:37:00 +0100 |
LWL/LWR/SWL/SWR 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 | 5 +++++
target/mips/translate.c | 5 +----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/target/mips/isa-mips32r6.decode b/target/mips/isa-mips32r6.decode
index e3b3934539a..89a0085fafd 100644
--- a/target/mips/isa-mips32r6.decode
+++ b/target/mips/isa-mips32r6.decode
@@ -20,5 +20,10 @@ REMOVED 010011 ----- ----- ----- ----- ------
# COP1X (COP3)
REMOVED 011100 ----- ----- ----- ----- ------ # SPECIAL2
+REMOVED 100010 ----- ----- ---------------- # LWL
+REMOVED 100110 ----- ----- ---------------- # LWR
+REMOVED 101010 ----- ----- ---------------- # SWL
+REMOVED 101110 ----- ----- ---------------- # SWR
+
REMOVED 101111 ----- ----- ---------------- # CACHE
REMOVED 110011 ----- ----- ---------------- # PREF
diff --git a/target/mips/translate.c b/target/mips/translate.c
index ba1b2360c50..3d627d049bd 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -28636,11 +28636,10 @@ 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:
- check_insn_opc_removed(ctx, ISA_MIPS32R6);
- /* Fallthrough */
case OPC_LB:
case OPC_LH:
case OPC_LW:
@@ -28651,8 +28650,6 @@ static void decode_opc(CPUMIPSState *env, DisasContext
*ctx)
break;
case OPC_SWL:
case OPC_SWR:
- check_insn_opc_removed(ctx, ISA_MIPS32R6);
- /* fall through */
case OPC_SB:
case OPC_SH:
case OPC_SW:
--
2.26.2
- [PATCH 04/13] target/mips: Introduce decodetree helpers for Release6 LSA/DLSA opcodes, (continued)
- [PATCH 04/13] target/mips: Introduce decodetree helpers for Release6 LSA/DLSA opcodes, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 05/13] target/mips: Remove now unreachable LSA/DLSA opcodes code, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 06/13] target/mips: Convert Rel6 Special2 opcode to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 07/13] target/mips: Convert Rel6 COP1X opcode to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 08/13] target/mips: Convert Rel6 CACHE/PREF opcodes to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 09/13] target/mips: Convert Rel6 LWL/LWR/SWL/SWR opcodes to decodetree,
Philippe Mathieu-Daudé <=
- [PATCH 10/13] target/mips: Convert Rel6 LWLE/LWRE/SWLE/SWRE opcodes to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 11/13] target/mips: Convert Rel6 LDL/LDR/SDL/SDR opcodes to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 12/13] target/mips: Convert Rel6 LLD/SCD opcodes to decodetree, Philippe Mathieu-Daudé, 2020/12/08
- [PATCH 13/13] target/mips: Convert Rel6 LL/SC opcodes to decodetree, Philippe Mathieu-Daudé, 2020/12/08