[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/13] target/mips: Convert Rel6 LWLE/LWRE/SWLE/SWRE opcodes to d
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 10/13] target/mips: Convert Rel6 LWLE/LWRE/SWLE/SWRE opcodes to decodetree |
Date: |
Tue, 8 Dec 2020 21:37:01 +0100 |
LWLE/LWRE/SWLE/SWRE (EVA) 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 | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/target/mips/isa-mips32r6.decode b/target/mips/isa-mips32r6.decode
index 89a0085fafd..3ec50704cf2 100644
--- a/target/mips/isa-mips32r6.decode
+++ b/target/mips/isa-mips32r6.decode
@@ -20,6 +20,11 @@ REMOVED 010011 ----- ----- ----- ----- ------
# COP1X (COP3)
REMOVED 011100 ----- ----- ----- ----- ------ # SPECIAL2
+REMOVED 011111 ----- ----- ---------- 011001 # LWLE
+REMOVED 011111 ----- ----- ---------- 011010 # LWRE
+REMOVED 011111 ----- ----- ---------- 100001 # SWLE
+REMOVED 011111 ----- ----- ---------- 100010 # SWRE
+
REMOVED 100010 ----- ----- ---------------- # LWL
REMOVED 100110 ----- ----- ---------------- # LWR
REMOVED 101010 ----- ----- ---------------- # SWL
diff --git a/target/mips/translate.c b/target/mips/translate.c
index 3d627d049bd..962522b0e02 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -28130,8 +28130,6 @@ static void decode_opc_special3(CPUMIPSState *env,
DisasContext *ctx)
switch (op1) {
case OPC_LWLE:
case OPC_LWRE:
- check_insn_opc_removed(ctx, ISA_MIPS32R6);
- /* fall through */
case OPC_LBUE:
case OPC_LHUE:
case OPC_LBE:
@@ -28143,8 +28141,6 @@ static void decode_opc_special3(CPUMIPSState *env,
DisasContext *ctx)
return;
case OPC_SWLE:
case OPC_SWRE:
- check_insn_opc_removed(ctx, ISA_MIPS32R6);
- /* fall through */
case OPC_SBE:
case OPC_SHE:
case OPC_SWE:
--
2.26.2
- [PATCH 05/13] target/mips: Remove now unreachable LSA/DLSA opcodes code, (continued)
- [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é, 2020/12/08
- [PATCH 10/13] target/mips: Convert Rel6 LWLE/LWRE/SWLE/SWRE opcodes to decodetree,
Philippe Mathieu-Daudé <=
- [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