From nobody Fri Dec 19 20:59:58 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=eik.bme.hu Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1635527905827802.7388232746439; Fri, 29 Oct 2021 10:18:25 -0700 (PDT) Received: from localhost ([::1]:50994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgVWL-0003fA-4C for importer@patchew.org; Fri, 29 Oct 2021 13:18:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUvy-0007HU-Lw for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:40:50 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:51118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUvq-0006HZ-MM for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:40:50 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 965AF7561B1; Fri, 29 Oct 2021 18:40:27 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id B8537756192; Fri, 29 Oct 2021 18:40:26 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v5 19/25] hw/intc/sh_intc: Avoid using continue in loops Date: Fri, 29 Oct 2021 18:23:36 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Richard Henderson , Magnus Damm , Yoshinori Sato Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1635527906228000003 Content-Type: text/plain; charset="utf-8" Instead of if !expr continue else do something it is more straight forward to say if expr then do something, especially if the action is just a few lines. Remove such uses of continue to make the code easier to follow. Signed-off-by: BALATON Zoltan Reviewed-by: Richard Henderson --- hw/intc/sh_intc.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index 56a288e093..eb58707e83 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -140,15 +140,14 @@ static void sh_intc_locate(struct intc_desc *desc, struct intc_mask_reg *mr =3D &desc->mask_regs[i]; =20 mode =3D sh_intc_mode(address, mr->set_reg, mr->clr_reg); - if (mode =3D=3D INTC_MODE_NONE) { - continue; + if (mode !=3D INTC_MODE_NONE) { + *modep =3D mode; + *datap =3D &mr->value; + *enums =3D mr->enum_ids; + *first =3D mr->reg_width - 1; + *width =3D 1; + return; } - *modep =3D mode; - *datap =3D &mr->value; - *enums =3D mr->enum_ids; - *first =3D mr->reg_width - 1; - *width =3D 1; - return; } } =20 @@ -157,15 +156,14 @@ static void sh_intc_locate(struct intc_desc *desc, struct intc_prio_reg *pr =3D &desc->prio_regs[i]; =20 mode =3D sh_intc_mode(address, pr->set_reg, pr->clr_reg); - if (mode =3D=3D INTC_MODE_NONE) { - continue; + if (mode !=3D INTC_MODE_NONE) { + *modep =3D mode | INTC_MODE_IS_PRIO; + *datap =3D &pr->value; + *enums =3D pr->enum_ids; + *first =3D pr->reg_width / pr->field_width - 1; + *width =3D pr->field_width; + return; } - *modep =3D mode | INTC_MODE_IS_PRIO; - *datap =3D &pr->value; - *enums =3D pr->enum_ids; - *first =3D pr->reg_width / pr->field_width - 1; - *width =3D pr->field_width; - return; } } g_assert_not_reached(); @@ -246,10 +244,9 @@ static void sh_intc_write(void *opaque, hwaddr offset, mask =3D (1 << width) - 1; mask <<=3D (first - k) * width; =20 - if ((*valuep & mask) =3D=3D (value & mask)) { - continue; + if ((*valuep & mask) !=3D (value & mask)) { + sh_intc_toggle_mask(desc, enum_ids[k], value & mask, 0); } - sh_intc_toggle_mask(desc, enum_ids[k], value & mask, 0); } =20 *valuep =3D value; @@ -342,12 +339,11 @@ void sh_intc_register_sources(struct intc_desc *desc, s->next_enum_id =3D gr->enum_ids[0]; =20 for (k =3D 1; k < ARRAY_SIZE(gr->enum_ids); k++) { - if (!gr->enum_ids[k]) { - continue; + if (gr->enum_ids[k]) { + id =3D gr->enum_ids[k - 1]; + s =3D &desc->sources[id]; + s->next_enum_id =3D gr->enum_ids[k]; } - id =3D gr->enum_ids[k - 1]; - s =3D &desc->sources[id]; - s->next_enum_id =3D gr->enum_ids[k]; } trace_sh_intc_register("group", gr->enum_id, 0xffff, s->enable_count, s->enable_max); --=20 2.21.4