From 3aff340c1745effb37bcb2f6fb7f6b921caded36 Mon Sep 17 00:00:00 2001 From: Bob Supnik Date: Mon, 13 Mar 2017 10:31:44 -0700 Subject: [PATCH] GRI, H316, I7094, NOVA, SDS, sigma: Annotate switch case fall through (COVERITY) --- GRI/gri_sys.c | 5 +++-- H316/h316_dp.c | 7 ++++--- I7094/i7094_binloader.c | 6 +++++- I7094/i7094_cd.c | 5 +++-- NOVA/nova_mta.c | 5 ++++- SDS/sds_drm.c | 5 +++-- sigma/sigma_map.c | 8 +++++--- sigma/sigma_mt.c | 6 ++++-- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/GRI/gri_sys.c b/GRI/gri_sys.c index 55168369..efda01eb 100644 --- a/GRI/gri_sys.c +++ b/GRI/gri_sys.c @@ -1,6 +1,6 @@ /* gri_sys.c: GRI-909 simulator interface - Copyright (c) 2001-2015, Robert M Supnik + Copyright (c) 2001-2017, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -23,6 +23,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + 13-Mar-17 RMS Annotated fall through in switch 14-Jan-08 RMS Added GRI-99 support 18-Oct-02 RMS Fixed bug in symbolic decode (Hans Pufal) */ @@ -617,7 +618,7 @@ switch (j) { /* case on class */ cptr = get_sd (cptr, val, ',', TRUE); /* src */ if (!cptr) return SCPE_ARG; - + /* fall through */ case F_V_SFI: /* skip func impl */ cptr = get_fnc (cptr, val); /* fo # */ break; diff --git a/H316/h316_dp.c b/H316/h316_dp.c index ac0145c7..3ad0b8e1 100644 --- a/H316/h316_dp.c +++ b/H316/h316_dp.c @@ -1,6 +1,6 @@ /* h316_dp.c: Honeywell 4623, 4651, 4720 disk simulator - Copyright (c) 2003-2015, Robert M. Supnik + Copyright (c) 2003-2017, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -27,6 +27,7 @@ 4651 disk subsystem 4720 disk subsystem + 13-Mar-17 RMS Annotated intentional fall through in switch 03-Jul-13 RLA compatibility changes for extended interrupts 19-Mar-12 RMS Fixed declaration of chan_req (Mark Pizzolato) 04-Sep-05 RMS Fixed missing return (Peter Schorn) @@ -109,7 +110,7 @@ #define STA_ANYER 0000002 /* any error^ */ #define STA_EOR 0000001 /* end of record */ #define STA_ALLERR (STA_ADRER|STA_FMTER|STA_HNLER|STA_OFLER|STA_SEKER|\ - STA_WPRER|STA_UNSER|STA_DTRER) + STA_WPRER|STA_UNSER|STA_DTRER) /* Functions */ @@ -471,7 +472,7 @@ switch (inst) { /* case on opcode */ case 011: case 012: case 013: /* !not seeking 0-6 */ case 014: case 015: case 016: case 017: - u = fnc - 011; + u = fnc - 011; /* set u, fall through */ case 007: /* !not seeking 7 */ if (!sim_is_active (&dp_unit[u]) || /* quiescent? */ (dp_unit[u].FNC != (FNC_SEEK | FNC_2ND))) diff --git a/I7094/i7094_binloader.c b/I7094/i7094_binloader.c index a6939307..a63a1b35 100644 --- a/I7094/i7094_binloader.c +++ b/I7094/i7094_binloader.c @@ -22,6 +22,8 @@ Except as contained in this notice, the name of the author shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the author. + + 13-Mar-17 RMS Annotated fall through in switch */ /*********************************************************************** * @@ -165,7 +167,7 @@ binloader (FILE *fd, char *file, int loadpt) case RELADDR_TAG: ldata = ldata + loadaddr; - + /* fall through */ case ABSDATA_TAG: STORE: #ifdef DEBUGLOADER @@ -177,6 +179,7 @@ binloader (FILE *fd, char *file, int loadpt) case ABSXFER_TAG: transfer = TRUE; + /* fall through */ case ABSENTRY_TAG: PC = (uint32) ldata & AMASK; #ifdef DEBUGLOADER @@ -188,6 +191,7 @@ binloader (FILE *fd, char *file, int loadpt) case RELXFER_TAG: transfer = TRUE; + /* fall through */ case RELENTRY_TAG: ldata = (ldata + loadaddr) & AMASK; PC = (uint32) ldata & AMASK; diff --git a/I7094/i7094_cd.c b/I7094/i7094_cd.c index 9b286653..6499c2de 100644 --- a/I7094/i7094_cd.c +++ b/I7094/i7094_cd.c @@ -1,6 +1,6 @@ /* i7094_cd.c: IBM 711/721 card reader/punch - Copyright (c) 2003-2012, Robert M. Supnik + Copyright (c) 2003-2017, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -26,6 +26,7 @@ cdr 711 card reader cdp 721 card punch + 13-Mar-17 RMS Annotated fall through in switch 19-Mar-12 RMS Fixed declaration of sim_switches (Mark Pizzolato) 19-Jan-07 RMS Added UNIT_TEXT 13-Jul-06 RMS Fixed problem with 80 column full cards @@ -246,7 +247,7 @@ switch (cdr_sta) { /* case on state */ cdr_bbuf[bufw] |= dat; } } - + /* fall through */ case CDS_DATA: /* data state */ dat = cdr_bbuf[cdr_bptr++]; /* get next word */ if (cdr_bptr >= CD_BINLNT) { /* last word? */ diff --git a/NOVA/nova_mta.c b/NOVA/nova_mta.c index 2305e770..b5285110 100644 --- a/NOVA/nova_mta.c +++ b/NOVA/nova_mta.c @@ -1,6 +1,6 @@ /* nova_mta.c: NOVA magnetic tape simulator - Copyright (c) 1993-2008, Robert M. Supnik + Copyright (c) 1993-2017, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -25,6 +25,7 @@ mta magnetic tape + 13-Mar-17 RMS Annotated fall through in switch 04-Jul-07 BKR fixed boot code to properly boot self-boot tapes; boot routine now uses standard DG APL boot code; device name changed to DG's MTA from DEC's MT. @@ -511,8 +512,10 @@ switch (st) { case MTSE_FMT: /* illegal fmt */ mta_upddsta (uptr, uptr->USTAT | STA_WLK | STA_RDY); + /* fall through */ case MTSE_UNATT: /* unattached */ mta_sta = mta_sta | STA_ILL; + /* fall through */ case MTSE_OK: /* no error */ return SCPE_IERR; /* never get here! */ diff --git a/SDS/sds_drm.c b/SDS/sds_drm.c index 0a8648ff..ec22cf82 100644 --- a/SDS/sds_drm.c +++ b/SDS/sds_drm.c @@ -1,6 +1,6 @@ /* sds_drm.c: SDS 940 Project Genie drum simulator - Copyright (c) 2002-2013, Robert M. Supnik + Copyright (c) 2002-2017, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -25,6 +25,7 @@ drm drum + 13-Mar-17 RMS Annotated fall through in switch 03-Sep-13 RMS Added explicit void * cast The drum is buffered in memory. @@ -237,7 +238,7 @@ if (drm_sta != DRM_SXFR) { /* fetch drum prog? */ case DRM_EIE: /* end, int if err */ if (!drm_err) return SCPE_OK; - + /* fall through */ case DRM_EIU: /* end, int uncond */ int_req = int_req | INT_DRM; return SCPE_OK; diff --git a/sigma/sigma_map.c b/sigma/sigma_map.c index 8458b240..450e8f6c 100644 --- a/sigma/sigma_map.c +++ b/sigma/sigma_map.c @@ -1,6 +1,6 @@ /* sigma_map.c: XDS Sigma memory access routines - Copyright (c) 2007, Robert M Supnik + Copyright (c) 2007-2017, Robert M Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -22,6 +22,8 @@ Except as contained in this notice, the name of Robert M Supnik shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Robert M Supnik. + + 13-Mar-17 RMS Annotated fall through in switch */ #include "sigma_defs.h" @@ -527,7 +529,7 @@ if (QCPU_S89) ((R[rn] & S89_SR1_MARG) >> S89_SR1_MAROFF); break; case 0xB: /* read sr0, clr */ - mem_sr0[memu] = mem_sr1[memu] = 0; + mem_sr0[memu] = mem_sr1[memu] = 0; /* fall through */ case 0x8: /* read sr0 */ R[rn] = (wd & S89_SR0_RD) | (((1u << (chan_num + 1)) - 1) << (S89_SR0_V_PORTS - (chan_num + 1))); @@ -556,7 +558,7 @@ else switch (CC) { /* 5X0 */ mmc_wlk[ppag | 1] = R[rn] & 0xF; break; case 0xC: /* read sr0, clr */ - mem_sr0[memu] = 0; + mem_sr0[memu] = 0; /* clr, fall through */ case 0x8: /* read sr0 */ R[rn] = S5X0_SR0_FIXED | (wd & S5X0_SR0_RD) | (((1u << (chan_num + 1)) - 1) << (S5X0_SR0_V_PORTS - (chan_num + 1))); diff --git a/sigma/sigma_mt.c b/sigma/sigma_mt.c index 17d76612..3395b07d 100644 --- a/sigma/sigma_mt.c +++ b/sigma/sigma_mt.c @@ -1,6 +1,6 @@ /* sigma_mt.c: Sigma 732X 9-track magnetic tape - Copyright (c) 2007-2008, Robert M. Supnik + Copyright (c) 2007-2017, Robert M. Supnik Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -25,6 +25,8 @@ mt 7320 and 7322/7323 magnetic tape + 13-Mar-17 RMS Annotated fall through in switch + Magnetic tapes are represented as a series of variable records of the form: @@ -475,7 +477,7 @@ switch (st) { case MTSE_FMT: /* illegal fmt */ case MTSE_UNATT: /* not attached */ case MTSE_WRP: /* write protect */ - chan_set_chf (mt_dib.dva, CHF_XMME); + chan_set_chf (mt_dib.dva, CHF_XMME); /* set err, fall through */ case MTSE_OK: /* no error */ chan_uen (mt_dib.dva); /* uend */ return SCPE_IERR;