From 9362022e951aa23728aee3e5e9e6db453a3259c2 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 21 Dec 2023 01:29:53 -0500 Subject: sim: common: fix -Wimplicit-fallthrough warnings Replace some fall through comments with the attribute. --- sim/common/dv-cfi.c | 6 ++++-- sim/common/hw-properties.c | 2 +- sim/common/sim-memopt.c | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sim/common/dv-cfi.c b/sim/common/dv-cfi.c index 95498d7..b9c9acd 100644 --- a/sim/common/dv-cfi.c +++ b/sim/common/dv-cfi.c @@ -210,7 +210,7 @@ cfi_unshift_addr (struct cfi *cfi, unsigned addr) { switch (cfi->width) { - case 4: addr >>= 1; /* fallthrough. */ + case 4: addr >>= 1; ATTRIBUTE_FALLTHROUGH; case 2: addr >>= 1; } return addr; @@ -414,7 +414,7 @@ cfi_io_write_buffer (struct hw *me, const void *source, int space, goto done; } - /* Fall through. */ + ATTRIBUTE_FALLTHROUGH; default: if (!cfi->cmdset->write (me, cfi, source, offset, value, nr_bytes)) @@ -490,6 +490,8 @@ cfi_io_read_buffer (struct hw *me, void *dest, int space, break; } + ATTRIBUTE_FALLTHROUGH; + default: if (!cfi->cmdset->read (me, cfi, dest, offset, shifted_offset, nr_bytes)) HW_TRACE ((me, "unhandled state %s", state_names[cfi->state])); diff --git a/sim/common/hw-properties.c b/sim/common/hw-properties.c index f1d7a77..42b4d3a 100644 --- a/sim/common/hw-properties.c +++ b/sim/common/hw-properties.c @@ -829,7 +829,7 @@ hw_find_string_array_property (struct hw *me, if (node->sizeof_array == 0 || ((char*)node->array)[node->sizeof_array - 1] != '\0') hw_abort (me, "property \"%s\" invalid for string array", property); - /* FALL THROUGH */ + ATTRIBUTE_FALLTHROUGH; case string_array_property: ASSERT (node->sizeof_array > 0); ASSERT (((char*)node->array)[node->sizeof_array - 1] == '\0'); diff --git a/sim/common/sim-memopt.c b/sim/common/sim-memopt.c index 7d46a86..c179d6a 100644 --- a/sim/common/sim-memopt.c +++ b/sim/common/sim-memopt.c @@ -300,10 +300,10 @@ parse_size (char *chp, break; case 'g': case 'G': /* Gigabyte suffix. */ *nr_bytes <<= 10; - /* Fall through. */ + ATTRIBUTE_FALLTHROUGH; case 'm': case 'M': /* Megabyte suffix. */ *nr_bytes <<= 10; - /* Fall through. */ + ATTRIBUTE_FALLTHROUGH; case 'k': case 'K': /* Kilobyte suffix. */ *nr_bytes <<= 10; /* Check for a modulo specifier after the suffix. */ -- cgit v1.1