From nobody Mon Feb 9 09:29:19 2026 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 1635452206858827.6468644245994; Thu, 28 Oct 2021 13:16:46 -0700 (PDT) Received: from localhost ([::1]:51302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgBpM-0006b2-Qu for importer@patchew.org; Thu, 28 Oct 2021 16:16:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49240) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgBWZ-0003eG-OS for qemu-devel@nongnu.org; Thu, 28 Oct 2021 15:57:20 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:64530) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgBWW-0000Oo-Ss for qemu-devel@nongnu.org; Thu, 28 Oct 2021 15:57:19 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 3EF567561F8; Thu, 28 Oct 2021 21:57:06 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 89C3B7561A5; Thu, 28 Oct 2021 21:57:05 +0200 (CEST) Message-Id: <54bccef4be622530ef93ea6d3a6829e2d48dab3e.1635449225.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v4 15/23] hw/intc/sh_intc: Inline and drop sh_intc_source() function Date: Thu, 28 Oct 2021 21:27:05 +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: 1635452208122100001 Content-Type: text/plain; charset="utf-8" This function is very simple and provides no advantage. Call sites become simpler without it so just write it in line and drop the separate function. Signed-off-by: BALATON Zoltan --- hw/intc/sh_intc.c | 54 +++++++++++++++++++---------------------------- hw/sh4/sh7750.c | 4 ++-- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index b1056f769e..57c341c030 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -263,33 +263,22 @@ static const MemoryRegionOps sh_intc_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -struct intc_source *sh_intc_source(struct intc_desc *desc, intc_enum id) -{ - if (id) { - return &desc->sources[id]; - } - return NULL; -} - static void sh_intc_register_source(struct intc_desc *desc, intc_enum source, struct intc_group *groups, int nr_groups) { unsigned int i, k; - struct intc_source *s; + intc_enum id; =20 if (desc->mask_regs) { for (i =3D 0; i < desc->nr_mask_regs; i++) { struct intc_mask_reg *mr =3D &desc->mask_regs[i]; =20 for (k =3D 0; k < ARRAY_SIZE(mr->enum_ids); k++) { - if (mr->enum_ids[k] !=3D source) { - continue; - } - s =3D sh_intc_source(desc, mr->enum_ids[k]); - if (s) { - s->enable_max++; + id =3D mr->enum_ids[k]; + if (id && id =3D=3D source) { + desc->sources[id].enable_max++; } } } @@ -300,12 +289,9 @@ static void sh_intc_register_source(struct intc_desc *= desc, struct intc_prio_reg *pr =3D &desc->prio_regs[i]; =20 for (k =3D 0; k < ARRAY_SIZE(pr->enum_ids); k++) { - if (pr->enum_ids[k] !=3D source) { - continue; - } - s =3D sh_intc_source(desc, pr->enum_ids[k]); - if (s) { - s->enable_max++; + id =3D pr->enum_ids[k]; + if (id && id =3D=3D source) { + desc->sources[id].enable_max++; } } } @@ -316,12 +302,9 @@ static void sh_intc_register_source(struct intc_desc *= desc, struct intc_group *gr =3D &groups[i]; =20 for (k =3D 0; k < ARRAY_SIZE(gr->enum_ids); k++) { - if (gr->enum_ids[k] !=3D source) { - continue; - } - s =3D sh_intc_source(desc, gr->enum_ids[k]); - if (s) { - s->enable_max++; + id =3D gr->enum_ids[k]; + if (id && id =3D=3D source) { + desc->sources[id].enable_max++; } } } @@ -336,14 +319,16 @@ void sh_intc_register_sources(struct intc_desc *desc, int nr_groups) { unsigned int i, k; + intc_enum id; struct intc_source *s; =20 for (i =3D 0; i < nr_vectors; i++) { struct intc_vect *vect =3D &vectors[i]; =20 sh_intc_register_source(desc, vect->enum_id, groups, nr_groups); - s =3D sh_intc_source(desc, vect->enum_id); - if (s) { + id =3D vect->enum_id; + if (id) { + s =3D &desc->sources[id]; s->vect =3D vect->vect; trace_sh_intc_register("source", vect->enum_id, s->vect, s->enable_count, s->enable_max); @@ -354,14 +339,16 @@ void sh_intc_register_sources(struct intc_desc *desc, for (i =3D 0; i < nr_groups; i++) { struct intc_group *gr =3D &groups[i]; =20 - s =3D sh_intc_source(desc, gr->enum_id); + id =3D gr->enum_id; + s =3D &desc->sources[id]; 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; } - s =3D sh_intc_source(desc, gr->enum_ids[k - 1]); + 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, @@ -463,7 +450,10 @@ void sh_intc_set_irl(void *opaque, int n, int level) { struct intc_source *s =3D opaque; int i, irl =3D level ^ 15; - for (i =3D 0; (s =3D sh_intc_source(s->parent, s->next_enum_id)); i++)= { + intc_enum id =3D s->next_enum_id; + + for (i =3D 0; id; id =3D s->next_enum_id, i++) { + s =3D &s->parent->sources[id]; if (i =3D=3D irl) { sh_intc_toggle_source(s, s->enable_count ? 0 : 1, s->asserted ? 0 : 1); diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c index 22016de664..3c10fc863d 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -905,6 +905,6 @@ SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *= sysmem) =20 qemu_irq sh7750_irl(SH7750State *s) { - sh_intc_toggle_source(sh_intc_source(&s->intc, IRL), 1, 0); /* enable = */ - return qemu_allocate_irq(sh_intc_set_irl, sh_intc_source(&s->intc, IRL= ), 0); + sh_intc_toggle_source(&s->intc.sources[IRL], 1, 0); /* enable */ + return qemu_allocate_irq(sh_intc_set_irl, &s->intc.sources[IRL], 0); } --=20 2.21.4