From nobody Wed Nov 19 03:02:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614193051; cv=none; d=zohomail.com; s=zohoarc; b=XoZzJSJjGtn5c28EujspbaaAvd+quskhD3MdN3gQSjX0REpGzLn/Q1KO2VpK6r7eHQY635vvvoQs9c+K5yIzfs4ppq8YZg28kbKyHzGjTVnaiyYXeGm8IL7p41X00wwG+nHMGbmWT9IAeNwyGyR2+kUah6orgAS+EsEeG1zh8jY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614193051; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dbstaMPFkZR/YHzcDJ3JxaNPdajf1J5Vka3V0TW9Seg=; b=CHrDtqzKF7cw+Nzyt/DtcFojb6flxB1pBqnDpVm2/5906mNO2TUOOqjGCLtZ5M+yAH49dheY/PVKCR7fcGvFtDHIcEZNXWVbNiIawH/5DdA1ZMmHpCr4nU/6Yznl+T7lQ7BBVFGtg2d9vJnvONf4xfAyTqsVJ0Vri32h1GyehTo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 161419305175671.24924924253128; Wed, 24 Feb 2021 10:57:31 -0800 (PST) Received: by mail-wr1-f47.google.com with SMTP id v15so2914798wrx.4 for ; Wed, 24 Feb 2021 10:57: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 2sm5462364wre.24.2021.02.24.10.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 10:57:29 -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=RgAKQxgs+TxE+DmR7wZ47qvFxL8vwwzI5LSCG6lUh+NyxJtb+ucdz+m9qV1lXMKQmA koViZc+unV+8teCUbsFmPdnTP9uCWoXCIwiF3RLYFEjEro+FuKlAQcdMHT1/Trs7Dq0V syLA3FltHjgilwvswGW6tPGkPMFGp/bdoSEPkWWm92k4tp0DF9cWvszB5kZPOgwJ+ZCD es6SxrUdnGrxWrxlaHLNZAL5CfA6MBObNxfUj3ByJvHoQS4lsd1y39LvpR86sNqx3Nun taUNRH2bqC/+54DvTGYUvzjOFKdjVKb7py6hkMEYTn3GBOUKJKCrrri10jkZmzs5tx0Q ZSJA== 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=KGz3wUqiDTqRsvhELY4lqbaYZ74aJC70cwopXbf+R+7ivmBkFC3Up4EZ4vkUSGkGVr /zbsJ72zfYIzoEB2k16Q8vK34XWuEDm2fOvo/xudIDzh/0Bk+pxcvqgAZajGZGZNEVBe G0y/e+j37UWq+lpv/GzoEKfIu1dAuINObd5tUsNJQIOHoa8zdJvl692ajwxrC+3kwfAV +PoeXpPnvVkDHHPl2FHeelhH6DrJyRf1Odf+XRVDAyiuy0lPd1FmF+xAaZHCE6hxGAvD VuoGrwjk8T93a1rendXoz9/j4l87yXcFEJRHNZth63k++89XlmafdZKEDHlmWMFJJGdp 966g== X-Gm-Message-State: AOAM531qNo97zKNw8VEsNqlE9mrkPzLkXM6ivofeZtP5Q3nX24HoUSMU UN6tJjWIcVf4qwleMQojb2M= X-Google-Smtp-Source: ABdhPJyn5OUo5mvI8NUXKDp4sB09xssm5NgiCMu0IY5LVjjCDrgeonyYr2C5QKa0TLiQpQbHhqcXZw== X-Received: by 2002:a5d:4d0e:: with SMTP id z14mr32276405wrt.411.1614193049749; Wed, 24 Feb 2021 10:57: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: Craig Janeczek , Jiaxun Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson , Aurelien Jarno Subject: [PATCH v4 03/12] target/mips: Rewrite complex ifdef'ry Date: Wed, 24 Feb 2021 19:56:57 +0100 Message-Id: <20210224185706.3293058-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210224185706.3293058-1-f4bug@amsat.org> References: <20210224185706.3293058-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