From nobody Fri Dec 19 20:54:55 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 1635527688339127.71506119360811; Fri, 29 Oct 2021 10:14:48 -0700 (PDT) Received: from localhost ([::1]:42914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgVSp-0006PX-Jo for importer@patchew.org; Fri, 29 Oct 2021 13:14:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUvx-0007Fg-Tp for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:40:49 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:51116) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgUvq-0006DO-BU for qemu-devel@nongnu.org; Fri, 29 Oct 2021 12:40:49 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 75332756198; Fri, 29 Oct 2021 18:40:27 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id AC9A37561B1; Fri, 29 Oct 2021 18:40:26 +0200 (CEST) Message-Id: <8e46054c4ea0f8e1814a69aa5dc6f51f4c6c1a2a.1635524617.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v5 16/25] hw/intc/sh_intc: Use array index instead of pointer arithmetics Date: Fri, 29 Oct 2021 18:23:36 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) 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: 1635527689718000001 Address of element i is one word thus clearer than array + i. Signed-off-by: BALATON Zoltan Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/intc/sh_intc.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/intc/sh_intc.c b/hw/intc/sh_intc.c index 537fc503d4..b1056f769e 100644 --- a/hw/intc/sh_intc.c +++ b/hw/intc/sh_intc.c @@ -89,7 +89,7 @@ int sh_intc_get_pending_vector(struct intc_desc *desc, in= t imask) } =20 for (i =3D 0; i < desc->nr_sources; i++) { - struct intc_source *source =3D desc->sources + i; + struct intc_source *source =3D &desc->sources[i]; =20 if (source->pending) { trace_sh_intc_pending(desc->pending, source->vect); @@ -138,7 +138,7 @@ static void sh_intc_locate(struct intc_desc *desc, =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; + 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) { @@ -155,7 +155,7 @@ static void sh_intc_locate(struct intc_desc *desc, =20 if (desc->prio_regs) { for (i =3D 0; i < desc->nr_prio_regs; i++) { - struct intc_prio_reg *pr =3D desc->prio_regs + i; + 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) { @@ -176,7 +176,7 @@ static void sh_intc_locate(struct intc_desc *desc, static void sh_intc_toggle_mask(struct intc_desc *desc, intc_enum id, int enable, int is_group) { - struct intc_source *source =3D desc->sources + id; + struct intc_source *source =3D &desc->sources[id]; =20 if (!id) { return; @@ -266,7 +266,7 @@ static const MemoryRegionOps sh_intc_ops =3D { struct intc_source *sh_intc_source(struct intc_desc *desc, intc_enum id) { if (id) { - return desc->sources + id; + return &desc->sources[id]; } return NULL; } @@ -281,7 +281,7 @@ static void sh_intc_register_source(struct intc_desc *d= esc, =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; + 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) { @@ -297,7 +297,7 @@ static void sh_intc_register_source(struct intc_desc *d= esc, =20 if (desc->prio_regs) { for (i =3D 0; i < desc->nr_prio_regs; i++) { - struct intc_prio_reg *pr =3D desc->prio_regs + i; + 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) { @@ -313,7 +313,7 @@ static void sh_intc_register_source(struct intc_desc *d= esc, =20 if (groups) { for (i =3D 0; i < nr_groups; i++) { - struct intc_group *gr =3D groups + i; + 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) { @@ -339,7 +339,7 @@ void sh_intc_register_sources(struct intc_desc *desc, struct intc_source *s; =20 for (i =3D 0; i < nr_vectors; i++) { - struct intc_vect *vect =3D 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); @@ -352,7 +352,7 @@ void sh_intc_register_sources(struct intc_desc *desc, =20 if (groups) { for (i =3D 0; i < nr_groups; i++) { - struct intc_group *gr =3D groups + i; + struct intc_group *gr =3D &groups[i]; =20 s =3D sh_intc_source(desc, gr->enum_id); s->next_enum_id =3D gr->enum_ids[0]; @@ -385,7 +385,7 @@ static unsigned int sh_intc_register(MemoryRegion *sysm= em, } =20 iomem =3D &desc->iomem; - iomem_p4 =3D desc->iomem_aliases + index; + iomem_p4 =3D &desc->iomem_aliases[index]; iomem_a7 =3D iomem_p4 + 1; =20 snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "p4"); @@ -425,7 +425,7 @@ int sh_intc_init(MemoryRegion *sysmem, desc->sources =3D g_malloc0(i); =20 for (i =3D 0; i < desc->nr_sources; i++) { - struct intc_source *source =3D desc->sources + i; + struct intc_source *source =3D &desc->sources[i]; =20 source->parent =3D desc; } @@ -436,7 +436,7 @@ int sh_intc_init(MemoryRegion *sysmem, =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; + struct intc_mask_reg *mr =3D &desc->mask_regs[i]; =20 j +=3D sh_intc_register(sysmem, desc, mr->set_reg, "mask", "se= t", j); j +=3D sh_intc_register(sysmem, desc, mr->clr_reg, "mask", "cl= r", j); @@ -445,7 +445,7 @@ int sh_intc_init(MemoryRegion *sysmem, =20 if (desc->prio_regs) { for (i =3D 0; i < desc->nr_prio_regs; i++) { - struct intc_prio_reg *pr =3D desc->prio_regs + i; + struct intc_prio_reg *pr =3D &desc->prio_regs[i]; =20 j +=3D sh_intc_register(sysmem, desc, pr->set_reg, "prio", "se= t", j); j +=3D sh_intc_register(sysmem, desc, pr->clr_reg, "prio", "cl= r", j); --=20 2.21.4