aboutsummaryrefslogtreecommitdiff
path: root/hw/sh4
diff options
context:
space:
mode:
authorBALATON Zoltan <balaton@eik.bme.hu>2021-10-29 23:02:09 +0200
committerPhilippe Mathieu-Daudé <f4bug@amsat.org>2021-10-30 11:46:40 +0200
commitac3c9e74c1ee1071e5be692a611c5ee261b9b581 (patch)
treec64ce8e8b2af3087b414f16a6b16ad916d5d85e1 /hw/sh4
parentf94bff1337ff525e2ff458b8e4cd57f9561acde3 (diff)
downloadqemu-ac3c9e74c1ee1071e5be692a611c5ee261b9b581.zip
qemu-ac3c9e74c1ee1071e5be692a611c5ee261b9b581.tar.gz
qemu-ac3c9e74c1ee1071e5be692a611c5ee261b9b581.tar.bz2
hw/sh4: Coding style: Add missing braces
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp> Message-Id: <b53a8cbcf57207fbd6408db1007b3e82008d60f7.1635541329.git.balaton@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Diffstat (limited to 'hw/sh4')
-rw-r--r--hw/sh4/r2d.c15
-rw-r--r--hw/sh4/sh7750.c24
-rw-r--r--hw/sh4/sh7750_regnames.c3
3 files changed, 27 insertions, 15 deletions
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 216d6e2..57ccae7 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -114,20 +114,23 @@ static const struct { short irl; uint16_t msk; } irqtab[NR_IRQS] = {
static void update_irl(r2d_fpga_t *fpga)
{
int i, irl = 15;
- for (i = 0; i < NR_IRQS; i++)
- if (fpga->irlmon & fpga->irlmsk & irqtab[i].msk)
- if (irqtab[i].irl < irl)
- irl = irqtab[i].irl;
+ for (i = 0; i < NR_IRQS; i++) {
+ if ((fpga->irlmon & fpga->irlmsk & irqtab[i].msk) &&
+ irqtab[i].irl < irl) {
+ irl = irqtab[i].irl;
+ }
+ }
qemu_set_irq(fpga->irl, irl ^ 15);
}
static void r2d_fpga_irq_set(void *opaque, int n, int level)
{
r2d_fpga_t *fpga = opaque;
- if (level)
+ if (level) {
fpga->irlmon |= irqtab[n].msk;
- else
+ } else {
fpga->irlmon &= ~irqtab[n].msk;
+ }
update_irl(fpga);
}
diff --git a/hw/sh4/sh7750.c b/hw/sh4/sh7750.c
index 1e61f9f..ca7e261 100644
--- a/hw/sh4/sh7750.c
+++ b/hw/sh4/sh7750.c
@@ -153,8 +153,9 @@ static void porta_changed(SH7750State *s, uint16_t prev)
fprintf(stderr, "pdtra=0x%04x, pctra=0x%08x\n", s->pdtra, s->pctra);
#endif
currenta = porta_lines(s);
- if (currenta == prev)
+ if (currenta == prev) {
return;
+ }
changes = currenta ^ prev;
for (i = 0; i < NB_DEVICES; i++) {
@@ -167,8 +168,9 @@ static void porta_changed(SH7750State *s, uint16_t prev)
}
}
- if (r)
+ if (r) {
gen_port_interrupts(s);
+ }
}
static void portb_changed(SH7750State *s, uint16_t prev)
@@ -177,8 +179,9 @@ static void portb_changed(SH7750State *s, uint16_t prev)
int i, r = 0;
currentb = portb_lines(s);
- if (currentb == prev)
+ if (currentb == prev) {
return;
+ }
changes = currentb ^ prev;
for (i = 0; i < NB_DEVICES; i++) {
@@ -191,8 +194,9 @@ static void portb_changed(SH7750State *s, uint16_t prev)
}
}
- if (r)
+ if (r) {
gen_port_interrupts(s);
+ }
}
/*
@@ -228,8 +232,9 @@ static uint32_t sh7750_mem_readw(void *opaque, hwaddr addr)
case SH7750_BCR2_A7:
return s->bcr2;
case SH7750_BCR3_A7:
- if (!has_bcr3_and_bcr4(s))
+ if (!has_bcr3_and_bcr4(s)) {
error_access("word read", addr);
+ }
return s->bcr3;
case SH7750_FRQCR_A7:
return 0;
@@ -263,8 +268,9 @@ static uint32_t sh7750_mem_readl(void *opaque, hwaddr addr)
case SH7750_BCR1_A7:
return s->bcr1;
case SH7750_BCR4_A7:
- if (!has_bcr3_and_bcr4(s))
+ if (!has_bcr3_and_bcr4(s)) {
error_access("long read", addr);
+ }
return s->bcr4;
case SH7750_WCR1_A7:
case SH7750_WCR2_A7:
@@ -332,8 +338,9 @@ static void sh7750_mem_writew(void *opaque, hwaddr addr,
s->bcr2 = mem_value;
return;
case SH7750_BCR3_A7:
- if (!has_bcr3_and_bcr4(s))
+ if (!has_bcr3_and_bcr4(s)) {
error_access("word write", addr);
+ }
s->bcr3 = mem_value;
return;
case SH7750_PCR_A7:
@@ -384,8 +391,9 @@ static void sh7750_mem_writel(void *opaque, hwaddr addr,
s->bcr1 = mem_value;
return;
case SH7750_BCR4_A7:
- if (!has_bcr3_and_bcr4(s))
+ if (!has_bcr3_and_bcr4(s)) {
error_access("long write", addr);
+ }
s->bcr4 = mem_value;
return;
case SH7750_WCR1_A7:
diff --git a/hw/sh4/sh7750_regnames.c b/hw/sh4/sh7750_regnames.c
index 37b3acd..e531d46 100644
--- a/hw/sh4/sh7750_regnames.c
+++ b/hw/sh4/sh7750_regnames.c
@@ -90,8 +90,9 @@ const char *regname(uint32_t addr)
unsigned int i;
for (i = 0; regnames[i].regaddr != (uint32_t)-1; i++) {
- if (regnames[i].regaddr == addr)
+ if (regnames[i].regaddr == addr) {
return regnames[i].regname;
+ }
}
return "<unknown reg>";