[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-6.2 2/4] target/mips: Decode vendor extensions before MIPS IS
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-6.2 2/4] target/mips: Decode vendor extensions before MIPS ISAs |
Date: |
Mon, 2 Aug 2021 01:42:00 +0200 |
In commit ffc672aa977 ("target/mips/tx79: Move MFHI1 / MFLO1
opcodes to decodetree") we misplaced the decoder call. Move
it to the correct place.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
target/mips/tcg/translate.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c
index 05efd25e29d..9572cc56947 100644
--- a/target/mips/tcg/translate.c
+++ b/target/mips/tcg/translate.c
@@ -16093,6 +16093,11 @@ static void decode_opc(CPUMIPSState *env, DisasContext
*ctx)
/* Transition to the auto-generated decoder. */
+ /* Vendor extensions */
+ if (cpu_supports_isa(env, INSN_R5900) && decode_ext_txx9(ctx,
ctx->opcode)) {
+ return;
+ }
+
/* ISA extensions */
if (ase_msa_available(env) && decode_ase_msa(ctx, ctx->opcode)) {
return;
@@ -16102,9 +16107,6 @@ static void decode_opc(CPUMIPSState *env, DisasContext
*ctx)
if (cpu_supports_isa(env, ISA_MIPS_R6) && decode_isa_rel6(ctx,
ctx->opcode)) {
return;
}
- if (cpu_supports_isa(env, INSN_R5900) && decode_ext_txx9(ctx,
ctx->opcode)) {
- return;
- }
if (decode_opc_legacy(env, ctx)) {
return;
--
2.31.1