target/mips: Rewrite complex ifdef'ry
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>
Thu, 18 Feb 2021 09:16:35 +0000 (10:16 +0100)
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>
Sat, 13 Mar 2021 22:42:45 +0000 (23:42 +0100)
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>

target/mips/translate.c

index 0b6d82d228ecb6aec1d1e38abf979744151460b2..ceb77a3a7ca77611c9241c22ee858a03d7fff0e6 100644 (file)
@@ -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)