From nobody Tue Feb 10 10:48:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1635613686; cv=none; d=zohomail.com; s=zohoarc; b=lXljWfaGkCD+yz9HZGe7Clducvp5qwf+FnfI1aIGFhq3DzvEkuBR+RWl/1HW2tPF9PpDAIsiA+0GwC941pttlZZ8iO9Hn0eqi5HKQlpIreNhe/nGZhW+2EaKrGTxmgB3gyybqvhLtYO1doQDiMGMbNl1uCck7XWKiDfqbrgMgr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635613686; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7WJPqv7zpyprAfWAj4SAgtpTfimABdVANbuRjgx08JY=; b=luk5s0hapz71kkbMVtvPsnTvq9YuApMXEXVuS1Y02uhpvFhVC6lc189rnq2rU+rzA5+23UBFwo6/PCV+WuDmCg8uBYYxRseto2lUshQvCmYycDJdg7jNRbXcoOU7gGxUosc3cc2SXRcxoWc0N73IWtP2Isl933kYT0BYKlWUXT8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1635613686479563.8791485963121; Sat, 30 Oct 2021 10:08:06 -0700 (PDT) Received: by mail-wm1-f41.google.com with SMTP id a20-20020a1c7f14000000b003231d13ee3cso14118277wmd.3 for ; Sat, 30 Oct 2021 10:08:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id z135sm14281303wmc.45.2021.10.30.10.08.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Oct 2021 10:08:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7WJPqv7zpyprAfWAj4SAgtpTfimABdVANbuRjgx08JY=; b=YXPZXRu2vKw39TY82Na++MetCVVAodpac3NtntydU0vp7bTYJWONDkEqZsMB0MU6mV EebEDkQ9tj9e/95vPr+QNriJ31xsB1vP8E2MrtWeKbFxn/gAUVwEWmoLBgl5g/YkCIeI ijGOl6Jtz8bzE2f939rlSFVgE0DNoZIHGPbkgDXhajik8PrvqDYmzcL2OyY9/xP5Bbww RgIH08rMEsAXjI1if5hmbk+tHcgJRQcw5mhYk/cRWfS5BQMwC+7IHSL24MZAfR9ePbR3 lfmiKnwrnZpRj96hD6CYj+cFBhqDPJjRdIdknwqwnQkPeJXtjL6vgLNcKfINmfSFWbKI 9vpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7WJPqv7zpyprAfWAj4SAgtpTfimABdVANbuRjgx08JY=; b=n1DSCcVSiHYno6B4nYMaMkeQaaRsx/PQylyTiTcIa0XgxWH9J5TCKLSdzecVXA75HD PB2R3ftM0sTAIirFIx86Lsrh/qno5B3+AxehEvIADWCGIQd8RNQzpcYE3c32Pp5kgfvA TCzChKFVgI+5+MgazRbn0Tub6QWsTdR8qQ7luKV6cxgV/bDJXFFYuRUyKr/LkMRha6X9 gRORVK9tAPSvy3iUliOA7PMmj+SeJpkl7FM+iIzRvcvlJIvsHBhI5YDW+8Htbp7ceVyL WH23eOan7AN1s9Rn/qK1qO+e76EMe0QSFPYfmW/SKyLyFc9F3captK3lMYw3/UK6o3Z9 cPfg== X-Gm-Message-State: AOAM5336g5HQ3Gxd3IgN/eFHKKCp+tx5xxN4YJSFSZVFTiMgDsijuNgT tfTJ+hhxTvMOInaKO4yuxE8= X-Google-Smtp-Source: ABdhPJyYuat/aJfRn+c5K9itSls3zuGEhBgweUs/Nw5iOiCC0I5UsDleZgJANqHOK4YDLWpKz4boow== X-Received: by 2002:a05:600c:40b:: with SMTP id q11mr1146454wmb.185.1635613684703; Sat, 30 Oct 2021 10:08:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Yoshinori Sato , Magnus Damm , Paolo Bonzini , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 22/30] hw/intc/sh_intc: Inline and drop sh_intc_source() function Date: Sat, 30 Oct 2021 19:06:07 +0200 Message-Id: <20211030170615.2636436-23-f4bug@amsat.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211030170615.2636436-1-f4bug@amsat.org> References: <20211030170615.2636436-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) X-ZM-MESSAGEID: 1635613687111100001 From: BALATON Zoltan 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 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sh4/sh_intc.h | 2 +- hw/intc/sh_intc.c | 54 ++++++++++++++++------------------------ hw/sh4/sh7750.c | 4 +-- 3 files changed, 25 insertions(+), 35 deletions(-) diff --git a/include/hw/sh4/sh_intc.h b/include/hw/sh4/sh_intc.h index 65f34250572..f62d5c5e136 100644 --- a/include/hw/sh4/sh_intc.h +++ b/include/hw/sh4/sh_intc.h @@ -58,7 +58,7 @@ struct intc_desc { }; =20 int sh_intc_get_pending_vector(struct intc_desc *desc, int imask); -struct intc_source *sh_intc_source(struct intc_desc *desc, intc_enum id); + void sh_intc_toggle_source(struct intc_source *source, int enable_adj, int assert_adj); =20 diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index e6e01428f9f..9995213cb0b 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -262,33 +262,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++; } } } @@ -299,12 +288,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++; } } } @@ -315,12 +301,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++; } } } @@ -335,14 +318,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); @@ -353,14 +338,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, @@ -462,7 +449,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 f7d21f61702..43dfb6497b5 100644 --- a/hw/sh4/sh7750.c +++ b/hw/sh4/sh7750.c @@ -899,6 +899,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.31.1