haraldwolff
/
qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/sh_intc: Inline and drop sh_intc_source() function 

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 <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <a98d1f7f94e91a42796b7d91e9153a7eaa3d1c44.1635541329.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
staging
BALATON Zoltan 2021-10-29 23:02:09 +02:00 committed by Philippe Mathieu-Daudé
parent 12201fe38a
commit 9b12fb10b7
3 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
hw/intc/sh_intc.c
View File

@ -262,33 +262,22 @@ static const MemoryRegionOps sh_intc_ops = {
.endianness = DEVICE_NATIVE_ENDIAN, .endianness = DEVICE_NATIVE_ENDIAN,
}; };
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, static void sh_intc_register_source(struct intc_desc *desc,
intc_enum source, intc_enum source,
struct intc_group *groups, struct intc_group *groups,
int nr_groups) int nr_groups)
{ {
unsigned int i, k; unsigned int i, k;
struct intc_source *s; intc_enum id;
if (desc->mask_regs) { if (desc->mask_regs) {
for (i = 0; i < desc->nr_mask_regs; i++) { 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++) { for (k = 0; k < ARRAY_SIZE(mr->enum_ids); k++) {
if (mr->enum_ids[k] != source) { id = mr->enum_ids[k];
continue; if (id && id == source) {
} desc->sources[id].enable_max++;
s = sh_intc_source(desc, mr->enum_ids[k]);
if (s) {
s->enable_max++;
} }
} }
} }
@ -299,12 +288,9 @@ static void sh_intc_register_source(struct intc_desc *desc,
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++) { for (k = 0; k < ARRAY_SIZE(pr->enum_ids); k++) {
if (pr->enum_ids[k] != source) { id = pr->enum_ids[k];
continue; if (id && id == source) {
} desc->sources[id].enable_max++;
s = sh_intc_source(desc, pr->enum_ids[k]);
if (s) {
s->enable_max++;
} }
} }
} }
@ -315,12 +301,9 @@ static void sh_intc_register_source(struct intc_desc *desc,
struct intc_group *gr = &groups[i]; struct intc_group *gr = &groups[i];
for (k = 0; k < ARRAY_SIZE(gr->enum_ids); k++) { for (k = 0; k < ARRAY_SIZE(gr->enum_ids); k++) {
if (gr->enum_ids[k] != source) { id = gr->enum_ids[k];
continue; if (id && id == source) {
} desc->sources[id].enable_max++;
s = sh_intc_source(desc, gr->enum_ids[k]);
if (s) {
s->enable_max++;
} }
} }
} }
@ -335,14 +318,16 @@ void sh_intc_register_sources(struct intc_desc *desc,
int nr_groups) int nr_groups)
{ {
unsigned int i, k; unsigned int i, k;
intc_enum id;
struct intc_source *s; struct intc_source *s;
for (i = 0; i < nr_vectors; i++) { 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); sh_intc_register_source(desc, vect->enum_id, groups, nr_groups);
s = sh_intc_source(desc, vect->enum_id); id = vect->enum_id;
if (s) { if (id) {
s = &desc->sources[id];
s->vect = vect->vect; s->vect = vect->vect;
trace_sh_intc_register("source", vect->enum_id, s->vect, trace_sh_intc_register("source", vect->enum_id, s->vect,
s->enable_count, s->enable_max); s->enable_count, s->enable_max);
@ -353,14 +338,16 @@ void sh_intc_register_sources(struct intc_desc *desc,
for (i = 0; i < nr_groups; i++) { 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); id = gr->enum_id;
s = &desc->sources[id];
s->next_enum_id = gr->enum_ids[0]; s->next_enum_id = gr->enum_ids[0];
for (k = 1; k < ARRAY_SIZE(gr->enum_ids); k++) { for (k = 1; k < ARRAY_SIZE(gr->enum_ids); k++) {
if (!gr->enum_ids[k]) { if (!gr->enum_ids[k]) {
continue; continue;
} }
s = sh_intc_source(desc, gr->enum_ids[k - 1]); id = gr->enum_ids[k - 1];
s = &desc->sources[id];
s->next_enum_id = gr->enum_ids[k]; s->next_enum_id = gr->enum_ids[k];
} }
trace_sh_intc_register("group", gr->enum_id, 0xffff, 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 = opaque; struct intc_source *s = opaque;
int i, irl = level ^ 15; int i, irl = level ^ 15;
for (i = 0; (s = sh_intc_source(s->parent, s->next_enum_id)); i++) { intc_enum id = s->next_enum_id;
for (i = 0; id; id = s->next_enum_id, i++) {
s = &s->parent->sources[id];
if (i == irl) { if (i == irl) {
sh_intc_toggle_source(s, s->enable_count ? 0 : 1, sh_intc_toggle_source(s, s->enable_count ? 0 : 1,
s->asserted ? 0 : 1); s->asserted ? 0 : 1);

4
hw/sh4/sh7750.c
View File

@ -899,6 +899,6 @@ SH7750State *sh7750_init(SuperHCPU *cpu, MemoryRegion *sysmem)
qemu_irq sh7750_irl(SH7750State *s) qemu_irq sh7750_irl(SH7750State *s)
{ {
sh_intc_toggle_source(sh_intc_source(&s->intc, IRL), 1, 0); /* enable */ sh_intc_toggle_source(&s->intc.sources[IRL], 1, 0); /* enable */
return qemu_allocate_irq(sh_intc_set_irl, sh_intc_source(&s->intc, IRL), 0); return qemu_allocate_irq(sh_intc_set_irl, &s->intc.sources[IRL], 0);
} }

2
include/hw/sh4/sh_intc.h
View File

@ -58,7 +58,7 @@ struct intc_desc {
}; };
int sh_intc_get_pending_vector(struct intc_desc *desc, int imask); 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, void sh_intc_toggle_source(struct intc_source *source,
int enable_adj, int assert_adj); int enable_adj, int assert_adj);