[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/30] hw/intc/sh_intc: Use array index instead of pointer arithme
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 21/30] hw/intc/sh_intc: Use array index instead of pointer arithmetics |
Date: |
Sat, 30 Oct 2021 19:06:06 +0200 |
From: BALATON Zoltan <balaton@eik.bme.hu>
Address of element i is one word thus clearer than array + i.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id:
<f49c9b1dee1fcaf374b092d862a6821907d5fcdc.1635541329.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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 416581dc07a..e6e01428f9f 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, int
imask)
}
for (i = 0; i < desc->nr_sources; i++) {
- struct intc_source *source = desc->sources + i;
+ struct intc_source *source = &desc->sources[i];
if (source->pending) {
trace_sh_intc_pending(desc->pending, source->vect);
@@ -137,7 +137,7 @@ static void sh_intc_locate(struct intc_desc *desc,
if (desc->mask_regs) {
for (i = 0; i < desc->nr_mask_regs; i++) {
- struct intc_mask_reg *mr = desc->mask_regs + i;
+ struct intc_mask_reg *mr = &desc->mask_regs[i];
mode = sh_intc_mode(address, mr->set_reg, mr->clr_reg);
if (mode == INTC_MODE_NONE) {
@@ -154,7 +154,7 @@ static void sh_intc_locate(struct intc_desc *desc,
if (desc->prio_regs) {
for (i = 0; i < desc->nr_prio_regs; i++) {
- struct intc_prio_reg *pr = desc->prio_regs + i;
+ struct intc_prio_reg *pr = &desc->prio_regs[i];
mode = sh_intc_mode(address, pr->set_reg, pr->clr_reg);
if (mode == INTC_MODE_NONE) {
@@ -175,7 +175,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 = desc->sources + id;
+ struct intc_source *source = &desc->sources[id];
if (!id) {
return;
@@ -265,7 +265,7 @@ static const MemoryRegionOps sh_intc_ops = {
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;
}
@@ -280,7 +280,7 @@ static void sh_intc_register_source(struct intc_desc *desc,
if (desc->mask_regs) {
for (i = 0; i < desc->nr_mask_regs; i++) {
- struct intc_mask_reg *mr = desc->mask_regs + i;
+ struct intc_mask_reg *mr = &desc->mask_regs[i];
for (k = 0; k < ARRAY_SIZE(mr->enum_ids); k++) {
if (mr->enum_ids[k] != source) {
@@ -296,7 +296,7 @@ static void sh_intc_register_source(struct intc_desc *desc,
if (desc->prio_regs) {
for (i = 0; i < desc->nr_prio_regs; i++) {
- struct intc_prio_reg *pr = desc->prio_regs + i;
+ struct intc_prio_reg *pr = &desc->prio_regs[i];
for (k = 0; k < ARRAY_SIZE(pr->enum_ids); k++) {
if (pr->enum_ids[k] != source) {
@@ -312,7 +312,7 @@ static void sh_intc_register_source(struct intc_desc *desc,
if (groups) {
for (i = 0; i < nr_groups; i++) {
- struct intc_group *gr = groups + i;
+ struct intc_group *gr = &groups[i];
for (k = 0; k < ARRAY_SIZE(gr->enum_ids); k++) {
if (gr->enum_ids[k] != source) {
@@ -338,7 +338,7 @@ void sh_intc_register_sources(struct intc_desc *desc,
struct intc_source *s;
for (i = 0; i < nr_vectors; i++) {
- struct intc_vect *vect = vectors + i;
+ struct intc_vect *vect = &vectors[i];
sh_intc_register_source(desc, vect->enum_id, groups, nr_groups);
s = sh_intc_source(desc, vect->enum_id);
@@ -351,7 +351,7 @@ void sh_intc_register_sources(struct intc_desc *desc,
if (groups) {
for (i = 0; i < nr_groups; i++) {
- struct intc_group *gr = groups + i;
+ struct intc_group *gr = &groups[i];
s = sh_intc_source(desc, gr->enum_id);
s->next_enum_id = gr->enum_ids[0];
@@ -384,7 +384,7 @@ static unsigned int sh_intc_register(MemoryRegion *sysmem,
}
iomem = &desc->iomem;
- iomem_p4 = desc->iomem_aliases + index;
+ iomem_p4 = &desc->iomem_aliases[index];
iomem_a7 = iomem_p4 + 1;
snprintf(name, sizeof(name), "intc-%s-%s-%s", type, action, "p4");
@@ -424,7 +424,7 @@ int sh_intc_init(MemoryRegion *sysmem,
desc->sources = g_malloc0(i);
for (i = 0; i < desc->nr_sources; i++) {
- struct intc_source *source = desc->sources + i;
+ struct intc_source *source = &desc->sources[i];
source->parent = desc;
}
@@ -435,7 +435,7 @@ int sh_intc_init(MemoryRegion *sysmem,
if (desc->mask_regs) {
for (i = 0; i < desc->nr_mask_regs; i++) {
- struct intc_mask_reg *mr = desc->mask_regs + i;
+ struct intc_mask_reg *mr = &desc->mask_regs[i];
j += sh_intc_register(sysmem, desc, mr->set_reg, "mask", "set", j);
j += sh_intc_register(sysmem, desc, mr->clr_reg, "mask", "clr", j);
@@ -444,7 +444,7 @@ int sh_intc_init(MemoryRegion *sysmem,
if (desc->prio_regs) {
for (i = 0; i < desc->nr_prio_regs; i++) {
- struct intc_prio_reg *pr = desc->prio_regs + i;
+ struct intc_prio_reg *pr = &desc->prio_regs[i];
j += sh_intc_register(sysmem, desc, pr->set_reg, "prio", "set", j);
j += sh_intc_register(sysmem, desc, pr->clr_reg, "prio", "clr", j);
--
2.31.1
- [PULL 11/30] hw/char/sh_serial: Embed QEMUTimer in state struct, (continued)
- [PULL 11/30] hw/char/sh_serial: Embed QEMUTimer in state struct, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 12/30] hw/char/sh_serial: Split off sh_serial_reset() from sh_serial_init(), Philippe Mathieu-Daudé, 2021/10/30
- [PULL 13/30] hw/char/sh_serial: QOM-ify, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 14/30] hw/char/sh_serial: Add device id to trace output, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 15/30] hw/intc/sh_intc: Use existing macro instead of local one, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 16/30] hw/intc/sh_intc: Turn some defines into an enum, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 17/30] hw/intc/sh_intc: Rename iomem region, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 18/30] hw/intc/sh_intc: Drop another useless macro, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 19/30] hw/intc/sh_intc: Move sh_intc_register() closer to its only user, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 20/30] hw/intc/sh_intc: Remove excessive parenthesis, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 21/30] hw/intc/sh_intc: Use array index instead of pointer arithmetics,
Philippe Mathieu-Daudé <=
- [PULL 22/30] hw/intc/sh_intc: Inline and drop sh_intc_source() function, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 23/30] hw/intc/sh_intc: Replace abort() with g_assert_not_reached(), Philippe Mathieu-Daudé, 2021/10/30
- [PULL 24/30] hw/intc/sh_intc: Avoid using continue in loops, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 25/30] hw/intc/sh_intc: Simplify allocating sources array, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 26/30] hw/intc/sh_intc: Remove unneeded local variable initialisers, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 27/30] hw/timer/sh_timer: Rename sh_timer_state to SHTimerState, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 28/30] hw/timer/sh_timer: Do not wrap lines that are not too long, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 29/30] hw/timer/sh_timer: Fix timer memory region size, Philippe Mathieu-Daudé, 2021/10/30
- [PULL 30/30] hw/timer/sh_timer: Remove use of hw_error, Philippe Mathieu-Daudé, 2021/10/30
- Re: [PULL 00/30] Renesas SH-4 patches for 2021-10-30, Richard Henderson, 2021/10/30