From nobody Mon Feb 9 23:02:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) client-ip=209.85.208.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1614331890; cv=none; d=zohomail.com; s=zohoarc; b=HKRPRUk+5fTH9bFnyy64xH7C3PXas7zt7QFiTgo+J3x3xztLCCex6f3Rqs6DLIOGuVFzO0mWWqLj7roZzrtj0lG1Uif7ujpny6vHA5MtcA3cXc7PbxWGtYPwfkBhGWfJXuyD51UT/60BmKbHn9z3qv3n0VR9s12v7hIu6FDtwI4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614331890; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dbstaMPFkZR/YHzcDJ3JxaNPdajf1J5Vka3V0TW9Seg=; b=kQMTVpPop2JE64QmLvlIotIbXzW7CjfGb/ouFrxshadrEZ14sq3Qaz8Gh7zit2e9/L328ACKgpI9zLYsr9Nx4GvcnXfQpxSkSM7yBBnaNtr3elwQk0WIQ5jc5AxhsJVi7LUId2zh2hiZgf81MeTLmGDWvgbYbTBkNlL48nBhb4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.208.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ed1-f45.google.com (mail-ed1-f45.google.com [209.85.208.45]) by mx.zohomail.com with SMTPS id 1614331890891729.8502410182057; Fri, 26 Feb 2021 01:31:30 -0800 (PST) Received: by mail-ed1-f45.google.com with SMTP id d2so10089013edq.10 for ; Fri, 26 Feb 2021 01:31:30 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id j17sm5346721edv.66.2021.02.26.01.31.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Feb 2021 01:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dbstaMPFkZR/YHzcDJ3JxaNPdajf1J5Vka3V0TW9Seg=; b=h2AFTtkqbk6BWjAJTvW98XGcwIVnTNzOUe5LZlMGwxJxBm0YqSHUNwq7c0ZyRmz0w1 VhWhmJEOAO4XS10pF+Ip2wNu5e7imIMDhuNQzvYxTGIuahUDBBwvEGpLXpzGzUF8eITk q4NXBTHxKpYWuZI6gLbt9GAvvhGy/4S0s5pL+lAJPI+nkFD0+4uJis8+GajfNG0aAKfW bpnUI2TL8aAomOvc/vlCIowNH+/7ADhvhmM5fMvnubDIneh5YvHBFr5JK9Nh6VMrQ5c4 DzkVUynShUDaWTBk+1h08foacIJELsVtzJnqRkxe+oRaRr0PnNVj9PECxePwXbRSS260 Kzdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dbstaMPFkZR/YHzcDJ3JxaNPdajf1J5Vka3V0TW9Seg=; b=KmbzMr4NQuWkjwzDDhcT6ovvp7N2klXSY3VwPEugHvcpI6r9ng7+ABqrCwReSGvvs/ fFL7K2thKck4zo/Ec/ilRzgJRTeJp02mDEcYU2Mu5I7X+cc7QDPUL+Ac4KMmjD7psQ1r XQ+cRNicf2G9PGAMevzzPOyInqmh+b80krqBtsqku3F0W/taED0MAFSxYvkm7dNjKKsM mp04cM2HTOFNtNnB1CUdsBF784ABHPDia4zT5NE0mOnWAAUipwgpQ/6eBiHOtGaoWgPw 87gsTT95gq1bpcvd9Y3VKk+/dihV426KLmPkfqluWMq91Bp3QlJj+HthoEmDcuRK0OxS PXag== X-Gm-Message-State: AOAM530phgbDBe5/e9tngLuVB8ZmO09EgucK3+ItR0zNyeG+OtluLF3b K0tpXMecJJ85IRQz6oQxhyU= X-Google-Smtp-Source: ABdhPJwf5l+22E6ayVEAGpzxA5ac93l2sqB/BO5C+9I265yye10Qf6ZC4hy9a1NyNBfF9yAA/9t3Og== X-Received: by 2002:aa7:cf12:: with SMTP id a18mr2225594edy.111.1614331889170; Fri, 26 Feb 2021 01:31:29 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Rikalo , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Richard Henderson Subject: [PATCH v5 03/13] target/mips: Rewrite complex ifdef'ry Date: Fri, 26 Feb 2021 10:31:00 +0100 Message-Id: <20210226093111.3865906-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210226093111.3865906-1-f4bug@amsat.org> References: <20210226093111.3865906-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) No need for this obfuscated ifdef'ry, KISS. Reviewed-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- target/mips/translate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/target/mips/translate.c b/target/mips/translate.c index 70891c37cdd..1f1c5f33c87 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) --=20 2.26.2