From: Philippe Mathieu-Daudé <f4bug@amsat.org>
Date: Thu, 18 Feb 2021 09:16:35 +0000 (+0100)
Subject: target/mips: Rewrite complex ifdef'ry
X-Git-Tag: v6.0.0-rc0~40^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f57f43cb8c2402d5ca552eafac438ea14d584df;p=thirdparty%2Fqemu.git

target/mips: Rewrite complex ifdef'ry

No need for this obfuscated ifdef'ry, KISS.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210226093111.3865906-4-f4bug@amsat.org>
---

diff --git a/target/mips/translate.c b/target/mips/translate.c
index 0b6d82d228e..ceb77a3a7ca 100644
--- a/target/mips/translate.c
+++ b/target/mips/translate.c
@@ -28276,13 +28276,16 @@ static bool decode_opc_legacy(CPUMIPSState *env, DisasContext *ctx)
 #if defined(TARGET_MIPS64)
         if ((ctx->insn_flags & INSN_R5900) && (ctx->insn_flags & ASE_MMI)) {
             decode_mmi(env, ctx);
-#else
+            break;
+        }
+#endif
+#if !defined(TARGET_MIPS64)
         if (ctx->insn_flags & ASE_MXU) {
             decode_opc_mxu(env, ctx);
-#endif
-        } else {
-            decode_opc_special2_legacy(env, ctx);
+            break;
         }
+#endif
+        decode_opc_special2_legacy(env, ctx);
         break;
     case OPC_SPECIAL3:
 #if defined(TARGET_MIPS64)