[PATCH v3 6/9] hw/misc/iotkit-secctl.c: use GNU C case ranges
Simon Xu <[email protected]>
| Newsgroups | org.nongnu.qemu-arm,org.nongnu.qemu-devel |
|---|---|
| Message-ID | <[email protected]> |
Replace case fall throughs with case ranges when register addresses are continous. Reviewed-by: Owen Giles <[email protected]> Reviewed-by: Robert Elliott <[email protected]> Signed-off-by: Simon Xu <[email protected]> Reviewed-by: Peter Maydell <[email protected]> Message-Id: <[email protected]> --- hw/misc/iotkit-secctl.c | 112 ++++++---------------------------------- 1 file changed, 16 insertions(+), 96 deletions(-) diff --git a/hw/misc/iotkit-secctl.c b/hw/misc/iotkit-secctl.c index 9f6fb81088..2d06d6f80f 100644 --- a/hw/misc/iotkit-secctl.c +++ b/hw/misc/iotkit-secctl.c @@ -187,36 +187,24 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr, case A_BRGINTEN: r = s->brginten; break; - case A_AHBNSPPCEXP0: - case A_AHBNSPPCEXP1: - case A_AHBNSPPCEXP2: - case A_AHBNSPPCEXP3: + case A_AHBNSPPCEXP0 ... A_AHBNSPPCEXP3: r = s->ahbexp[offset_to_ppc_idx(offset)].ns; break; case A_APBNSPPC0: case A_APBNSPPC1: r = s->apb[offset_to_ppc_idx(offset)].ns; break; - case A_APBNSPPCEXP0: - case A_APBNSPPCEXP1: - case A_APBNSPPCEXP2: - case A_APBNSPPCEXP3: + case A_APBNSPPCEXP0 ... A_APBNSPPCEXP3: r = s->apbexp[offset_to_ppc_idx(offset)].ns; break; - case A_AHBSPPPCEXP0: - case A_AHBSPPPCEXP1: - case A_AHBSPPPCEXP2: - case A_AHBSPPPCEXP3: + case A_AHBSPPPCEXP0 ... A_AHBSPPPCEXP3: r = s->ahbexp[offset_to_ppc_idx(offset)].sp; break; case A_APBSPPPC0: case A_APBSPPPC1: r = s->apb[offset_to_ppc_idx(offset)].sp; break; - case A_APBSPPPCEXP0: - case A_APBSPPPCEXP1: - case A_APBSPPPCEXP2: - case A_APBSPPPCEXP3: + case A_APBSPPPCEXP0 ... A_APBSPPPCEXP3: r = s->apbexp[offset_to_ppc_idx(offset)].sp; break; case A_SECMSCINTSTAT: @@ -228,18 +216,7 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr, case A_NSMSCEXP: r = s->nsmscexp; break; - case A_PID4: - case A_PID5: - case A_PID6: - case A_PID7: - case A_PID0: - case A_PID1: - case A_PID2: - case A_PID3: - case A_CID0: - case A_CID1: - case A_CID2: - case A_CID3: + case A_PID4 ... A_CID3: switch (s->sse_version) { case ARMSSE_SSE300: r = iotkit_secctl_s_sse300_idregs[(offset - A_PID4) / 4]; @@ -389,10 +366,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr, case A_BRGINTEN: s->brginten = value & 0xffff0000; break; - case A_AHBNSPPCEXP0: - case A_AHBNSPPCEXP1: - case A_AHBNSPPCEXP2: - case A_AHBNSPPCEXP3: + case A_AHBNSPPCEXP0 ... A_AHBNSPPCEXP3: ppc = &s->ahbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_ns_write(ppc, value); break; @@ -401,17 +375,11 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr, ppc = &s->apb[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_ns_write(ppc, value); break; - case A_APBNSPPCEXP0: - case A_APBNSPPCEXP1: - case A_APBNSPPCEXP2: - case A_APBNSPPCEXP3: + case A_APBNSPPCEXP0 ... A_APBNSPPCEXP3: ppc = &s->apbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_ns_write(ppc, value); break; - case A_AHBSPPPCEXP0: - case A_AHBSPPPCEXP1: - case A_AHBSPPPCEXP2: - case A_AHBSPPPCEXP3: + case A_AHBSPPPCEXP0 ... A_AHBSPPPCEXP3: ppc = &s->ahbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_sp_write(ppc, value); break; @@ -420,10 +388,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr, ppc = &s->apb[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_sp_write(ppc, value); break; - case A_APBSPPPCEXP0: - case A_APBSPPPCEXP1: - case A_APBSPPPCEXP2: - case A_APBSPPPCEXP3: + case A_APBSPPPCEXP0 ... A_APBSPPPCEXP3: ppc = &s->apbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_sp_write(ppc, value); break; @@ -444,18 +409,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr, case A_BRGINTSTAT: case A_AHBNSPPC0: case A_AHBSPPPC0: - case A_PID4: - case A_PID5: - case A_PID6: - case A_PID7: - case A_PID0: - case A_PID1: - case A_PID2: - case A_PID3: - case A_CID0: - case A_CID1: - case A_CID2: - case A_CID3: + case A_PID4 ... A_CID3: qemu_log_mask(LOG_GUEST_ERROR, "IoTKit SecCtl S block write: " "read-only offset 0x%x\n", offset); @@ -482,34 +436,17 @@ static MemTxResult iotkit_secctl_ns_read(void *opaque, hwaddr addr, case A_AHBNSPPPC0: r = 0; break; - case A_AHBNSPPPCEXP0: - case A_AHBNSPPPCEXP1: - case A_AHBNSPPPCEXP2: - case A_AHBNSPPPCEXP3: + case A_AHBNSPPPCEXP0 ... A_AHBNSPPPCEXP3: r = s->ahbexp[offset_to_ppc_idx(offset)].nsp; break; case A_APBNSPPPC0: case A_APBNSPPPC1: r = s->apb[offset_to_ppc_idx(offset)].nsp; break; - case A_APBNSPPPCEXP0: - case A_APBNSPPPCEXP1: - case A_APBNSPPPCEXP2: - case A_APBNSPPPCEXP3: + case A_APBNSPPPCEXP0 ... A_APBNSPPPCEXP3: r = s->apbexp[offset_to_ppc_idx(offset)].nsp; break; - case A_PID4: - case A_PID5: - case A_PID6: - case A_PID7: - case A_PID0: - case A_PID1: - case A_PID2: - case A_PID3: - case A_CID0: - case A_CID1: - case A_CID2: - case A_CID3: + case A_PID4 ... A_CID3: switch (s->sse_version) { case ARMSSE_SSE300: r = iotkit_secctl_ns_sse300_idregs[(offset - A_PID4) / 4]; @@ -560,10 +497,7 @@ static MemTxResult iotkit_secctl_ns_write(void *opaque, hwaddr addr, } switch (offset) { - case A_AHBNSPPPCEXP0: - case A_AHBNSPPPCEXP1: - case A_AHBNSPPPCEXP2: - case A_AHBNSPPPCEXP3: + case A_AHBNSPPPCEXP0 ... A_AHBNSPPPCEXP3: ppc = &s->ahbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_nsp_write(ppc, value); break; @@ -572,26 +506,12 @@ static MemTxResult iotkit_secctl_ns_write(void *opaque, hwaddr addr, ppc = &s->apb[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_nsp_write(ppc, value); break; - case A_APBNSPPPCEXP0: - case A_APBNSPPPCEXP1: - case A_APBNSPPPCEXP2: - case A_APBNSPPPCEXP3: + case A_APBNSPPPCEXP0 ... A_APBNSPPPCEXP3: ppc = &s->apbexp[offset_to_ppc_idx(offset)]; iotkit_secctl_ppc_nsp_write(ppc, value); break; case A_AHBNSPPPC0: - case A_PID4: - case A_PID5: - case A_PID6: - case A_PID7: - case A_PID0: - case A_PID1: - case A_PID2: - case A_PID3: - case A_CID0: - case A_CID1: - case A_CID2: - case A_CID3: + case A_PID4 ... A_CID3: qemu_log_mask(LOG_GUEST_ERROR, "IoTKit SecCtl NS block write: " "read-only offset 0x%x\n", offset); -- 2.53.0