@samitouri / QOSamiQemu / commits / 004ef50b84

hw/misc/iotkit-secctl.c: use GNU C case ranges

Replace case fall throughs with case ranges when register addresses are continous. Reviewed-by: Owen Giles <owen.giles@hpe.com> Reviewed-by: Robert Elliott <elliott@hpe.com> Signed-off-by: Simon Xu <simonxhy0404@gmail.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20260805153005.9989-7-simonxhy0404@gmail.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Simon Xu committed Aug 17, 2026 at 19:26 UTC 004ef50b84a5f4f72e08b3a1f92381fac2ec787f

1 file changed +16 -96

hw/misc/iotkit-secctl.c

+16 -96

@@ -187,36 +187,24 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr,

187 case A_BRGINTEN:

188 r = s->brginten;

189 break;

190 - case A_AHBNSPPCEXP0:

191 - case A_AHBNSPPCEXP1:

192 - case A_AHBNSPPCEXP2:

193 - case A_AHBNSPPCEXP3:

190 + case A_AHBNSPPCEXP0 ... A_AHBNSPPCEXP3:

191 r = s->ahbexp[offset_to_ppc_idx(offset)].ns;

192 break;

193 case A_APBNSPPC0:

194 case A_APBNSPPC1:

195 r = s->apb[offset_to_ppc_idx(offset)].ns;

196 break;

200 - case A_APBNSPPCEXP0:

201 - case A_APBNSPPCEXP1:

202 - case A_APBNSPPCEXP2:

203 - case A_APBNSPPCEXP3:

197 + case A_APBNSPPCEXP0 ... A_APBNSPPCEXP3:

198 r = s->apbexp[offset_to_ppc_idx(offset)].ns;

199 break;

206 - case A_AHBSPPPCEXP0:

207 - case A_AHBSPPPCEXP1:

208 - case A_AHBSPPPCEXP2:

209 - case A_AHBSPPPCEXP3:

200 + case A_AHBSPPPCEXP0 ... A_AHBSPPPCEXP3:

201 r = s->ahbexp[offset_to_ppc_idx(offset)].sp;

202 break;

203 case A_APBSPPPC0:

204 case A_APBSPPPC1:

205 r = s->apb[offset_to_ppc_idx(offset)].sp;

206 break;

216 - case A_APBSPPPCEXP0:

217 - case A_APBSPPPCEXP1:

218 - case A_APBSPPPCEXP2:

219 - case A_APBSPPPCEXP3:

207 + case A_APBSPPPCEXP0 ... A_APBSPPPCEXP3:

208 r = s->apbexp[offset_to_ppc_idx(offset)].sp;

209 break;

210 case A_SECMSCINTSTAT:

@@ -228,18 +216,7 @@ static MemTxResult iotkit_secctl_s_read(void *opaque, hwaddr addr,

216 case A_NSMSCEXP:

217 r = s->nsmscexp;

218 break;

231 - case A_PID4:

232 - case A_PID5:

233 - case A_PID6:

234 - case A_PID7:

235 - case A_PID0:

236 - case A_PID1:

237 - case A_PID2:

238 - case A_PID3:

239 - case A_CID0:

240 - case A_CID1:

241 - case A_CID2:

242 - case A_CID3:

219 + case A_PID4 ... A_CID3:

220 switch (s->sse_version) {

221 case ARMSSE_SSE300:

222 r = iotkit_secctl_s_sse300_idregs[(offset - A_PID4) / 4];

@@ -389,10 +366,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr,

366 case A_BRGINTEN:

367 s->brginten = value & 0xffff0000;

368 break;

392 - case A_AHBNSPPCEXP0:

393 - case A_AHBNSPPCEXP1:

394 - case A_AHBNSPPCEXP2:

395 - case A_AHBNSPPCEXP3:

369 + case A_AHBNSPPCEXP0 ... A_AHBNSPPCEXP3:

370 ppc = &s->ahbexp[offset_to_ppc_idx(offset)];

371 iotkit_secctl_ppc_ns_write(ppc, value);

372 break;

@@ -401,17 +375,11 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr,

375 ppc = &s->apb[offset_to_ppc_idx(offset)];

376 iotkit_secctl_ppc_ns_write(ppc, value);

377 break;

404 - case A_APBNSPPCEXP0:

405 - case A_APBNSPPCEXP1:

406 - case A_APBNSPPCEXP2:

407 - case A_APBNSPPCEXP3:

378 + case A_APBNSPPCEXP0 ... A_APBNSPPCEXP3:

379 ppc = &s->apbexp[offset_to_ppc_idx(offset)];

380 iotkit_secctl_ppc_ns_write(ppc, value);

381 break;

411 - case A_AHBSPPPCEXP0:

412 - case A_AHBSPPPCEXP1:

413 - case A_AHBSPPPCEXP2:

414 - case A_AHBSPPPCEXP3:

382 + case A_AHBSPPPCEXP0 ... A_AHBSPPPCEXP3:

383 ppc = &s->ahbexp[offset_to_ppc_idx(offset)];

384 iotkit_secctl_ppc_sp_write(ppc, value);

385 break;

@@ -420,10 +388,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr,

388 ppc = &s->apb[offset_to_ppc_idx(offset)];

389 iotkit_secctl_ppc_sp_write(ppc, value);

390 break;

423 - case A_APBSPPPCEXP0:

424 - case A_APBSPPPCEXP1:

425 - case A_APBSPPPCEXP2:

426 - case A_APBSPPPCEXP3:

391 + case A_APBSPPPCEXP0 ... A_APBSPPPCEXP3:

392 ppc = &s->apbexp[offset_to_ppc_idx(offset)];

393 iotkit_secctl_ppc_sp_write(ppc, value);

394 break;

@@ -444,18 +409,7 @@ static MemTxResult iotkit_secctl_s_write(void *opaque, hwaddr addr,

409 case A_BRGINTSTAT:

410 case A_AHBNSPPC0:

411 case A_AHBSPPPC0:

447 - case A_PID4:

448 - case A_PID5:

449 - case A_PID6:

450 - case A_PID7:

451 - case A_PID0:

452 - case A_PID1:

453 - case A_PID2:

454 - case A_PID3:

455 - case A_CID0:

456 - case A_CID1:

457 - case A_CID2:

458 - case A_CID3:

412 + case A_PID4 ... A_CID3:

413 qemu_log_mask(LOG_GUEST_ERROR,

414 "IoTKit SecCtl S block write: "

415 "read-only offset 0x%x\n", offset);

@@ -482,34 +436,17 @@ static MemTxResult iotkit_secctl_ns_read(void *opaque, hwaddr addr,

436 case A_AHBNSPPPC0:

437 r = 0;

438 break;

485 - case A_AHBNSPPPCEXP0:

486 - case A_AHBNSPPPCEXP1:

487 - case A_AHBNSPPPCEXP2:

488 - case A_AHBNSPPPCEXP3:

439 + case A_AHBNSPPPCEXP0 ... A_AHBNSPPPCEXP3:

440 r = s->ahbexp[offset_to_ppc_idx(offset)].nsp;

441 break;

442 case A_APBNSPPPC0:

443 case A_APBNSPPPC1:

444 r = s->apb[offset_to_ppc_idx(offset)].nsp;

445 break;

495 - case A_APBNSPPPCEXP0:

496 - case A_APBNSPPPCEXP1:

497 - case A_APBNSPPPCEXP2:

498 - case A_APBNSPPPCEXP3:

446 + case A_APBNSPPPCEXP0 ... A_APBNSPPPCEXP3:

447 r = s->apbexp[offset_to_ppc_idx(offset)].nsp;

448 break;

501 - case A_PID4:

502 - case A_PID5:

503 - case A_PID6:

504 - case A_PID7:

505 - case A_PID0:

506 - case A_PID1:

507 - case A_PID2:

508 - case A_PID3:

509 - case A_CID0:

510 - case A_CID1:

511 - case A_CID2:

512 - case A_CID3:

449 + case A_PID4 ... A_CID3:

450 switch (s->sse_version) {

451 case ARMSSE_SSE300:

452 r = iotkit_secctl_ns_sse300_idregs[(offset - A_PID4) / 4];

@@ -560,10 +497,7 @@ static MemTxResult iotkit_secctl_ns_write(void *opaque, hwaddr addr,

497 }

498

499 switch (offset) {

563 - case A_AHBNSPPPCEXP0:

564 - case A_AHBNSPPPCEXP1:

565 - case A_AHBNSPPPCEXP2:

566 - case A_AHBNSPPPCEXP3:

500 + case A_AHBNSPPPCEXP0 ... A_AHBNSPPPCEXP3:

501 ppc = &s->ahbexp[offset_to_ppc_idx(offset)];

502 iotkit_secctl_ppc_nsp_write(ppc, value);

503 break;

@@ -572,26 +506,12 @@ static MemTxResult iotkit_secctl_ns_write(void *opaque, hwaddr addr,

506 ppc = &s->apb[offset_to_ppc_idx(offset)];

507 iotkit_secctl_ppc_nsp_write(ppc, value);

508 break;

575 - case A_APBNSPPPCEXP0:

576 - case A_APBNSPPPCEXP1:

577 - case A_APBNSPPPCEXP2:

578 - case A_APBNSPPPCEXP3:

509 + case A_APBNSPPPCEXP0 ... A_APBNSPPPCEXP3:

510 ppc = &s->apbexp[offset_to_ppc_idx(offset)];

511 iotkit_secctl_ppc_nsp_write(ppc, value);

512 break;

513 case A_AHBNSPPPC0:

583 - case A_PID4:

584 - case A_PID5:

585 - case A_PID6:

586 - case A_PID7:

587 - case A_PID0:

588 - case A_PID1:

589 - case A_PID2:

590 - case A_PID3:

591 - case A_CID0:

592 - case A_CID1:

593 - case A_CID2:

594 - case A_CID3:

514 + case A_PID4 ... A_CID3:

515 qemu_log_mask(LOG_GUEST_ERROR,

516 "IoTKit SecCtl NS block write: "

517 "read-only offset 0x%x\n", offset);