From nobody Tue Feb 10 05:41:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615664953; cv=none; d=zohomail.com; s=zohoarc; b=WApeIvadg8f/EiMAvabwnTCkG5lA5dQOr5wXccitH6fc+/qrhdBc+ufXlMy28xneLn1XwWLWpsK5WYXKRURFIg+N673vx2GOh22ysAegKkLHe357G9Bn5Z0EZGhhgOlV/XhTsP082FkPLJwdBDyc0XsDvV+rbQwkF4NQOo0aims= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615664953; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QT135G9+ZflxNaE9JXFsl2Girh95rzMzYvPq1Qqa2Qk=; b=mj4J4Ww/MM3pMc0N+FwSL6Yj/7GLLETufHZ5zRLVIYiFvDTtPAXqCTJmgnuaGFZ5HLdJJBnzisPiYVhSyqBkc1nurnUgJ8uiWb+TFzKxwJhBjSIIUndivSEK1CtR6KSp1IY8kSEQGnNVTAqLXPnbz+xj3AlpfPpGzQtn6ZAZPLY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1615664953122238.08297478614088; Sat, 13 Mar 2021 11:49:13 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id o14so2817631wrm.11 for ; Sat, 13 Mar 2021 11:49:12 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id x11sm8409619wme.9.2021.03.13.11.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Mar 2021 11:49:11 -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=QT135G9+ZflxNaE9JXFsl2Girh95rzMzYvPq1Qqa2Qk=; b=MmuGRmy8UhezppiyA4ChcDyh8ZlcDuabjxgQ5ugaWA3gBqJAUIrYBNFpgF2zCvYW8I ERM8xhsF2SA4cysQQETsNhBgfnKcrqqUCo4u13EQXxq0Da0Xf3bq/CXBhGEiO5iBYguG hrvrROm/qQYsNQzqueDmhC2okfj4nBve6uKz7PyKN37t/jX3IWIB8vW9FodOdxhJyNad T9nD88cpnAIl66cE8dF7YQ7xoho4KL1q40RVUWk1ezWB1CvKjwRmo90/YaSXAVBXRmcH AflXAGQqid+KmOkDINo5HFOLtsskNsbg/v9sNcwhihPd7NcPJU5SC5rQziIDrCGe64Uj QBFw== 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=QT135G9+ZflxNaE9JXFsl2Girh95rzMzYvPq1Qqa2Qk=; b=IRBrN9JxeeNrWHBAPCiwliy07TktfxOGKUPa3Gii2jHMYt98iR2sOYkesJU2Ovu7jC eidMcFs2oiI9OFWq25y8HN8HMV0ZKFOB15Twca4MoCVRMFgc9eDDkI4HaITkqRll1Att PHOQNbV9vGH1jBjh04YzxKn7jAnqGXbDkqGfALKucTdsSvP0EgLY1wXq2FyQqlNBRmEK ZYuDKXOBEXVhoe8KJWBNZm8ktUe/uK2EWNW/efpXzluK6jB7/5Ky2lwKrhDuVCPvA5gX XXDTlB0m5YJIwAx2a0wX0u1vjgONco2iuIG5eEkk80FbznQr9gfOuAxlfH3hO1zipVFm +t5A== X-Gm-Message-State: AOAM532eio+tonu5F74EoCD7YWxP5gRSMdKu9WCJmmf6meROYblZ+kJV RreXuVAvSZvZpChcSYp+gYw= X-Google-Smtp-Source: ABdhPJx6cfM6335gPZTv6t+xPo0V2/oMCq6Ub2BmeIqV1vo6y/LXbm7j5FFmQ82sTp8Qyt7CvmY9jw== X-Received: by 2002:adf:d1ce:: with SMTP id b14mr19987184wrd.126.1615664951444; Sat, 13 Mar 2021 11:49:11 -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: Aurelien Jarno , Aleksandar Rikalo , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PULL 08/27] target/mips: Rewrite complex ifdef'ry Date: Sat, 13 Mar 2021 20:48:10 +0100 Message-Id: <20210313194829.2193621-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210313194829.2193621-1-f4bug@amsat.org> References: <20210313194829.2193621-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 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) --=20 2.26.2