From 86a73007627a3c52d1c624ed430ac0e74fb8cc3e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 27 Sep 2016 11:18:04 -0600 Subject: Fix "fall through" comments This patch updates existing "fall through" comments so that they can be recognized by gcc's -Wimplicit-fallthrough comment-parsing heuristic. ChangeLog 2018-05-04 Tom Tromey * s390-tdep.c (s390_process_record): Fix fall-through comments. * xcoffread.c (scan_xcoff_symtab): Move comment later. * symfile.c (section_is_mapped): Fix fall-through comment. * stabsread.c (define_symbol, read_member_functions): Fix fall-through comment. * s390-linux-tdep.c (s390_process_record): Fix fall-through comment. * remote.c (remote_wait_as): Fix fall-through comment. * p-exp.y (yylex): Fix fall-through comment. * nat/x86-dregs.c (x86_length_and_rw_bits): Fix fall-through comment. * msp430-tdep.c (msp430_gdbarch_init): Fix fall-through comment. * mdebugread.c (parse_partial_symbols): Fix fall-through comment. * jv-exp.y (yylex): Fix fall-through comment. * go-exp.y (lex_one_token): Fix fall-through comment. * gdbtypes.c (get_discrete_bounds, rank_one_type): Fix fall-through comment. * f-exp.y (yylex): Fix fall-through comment. * dwarf2read.c (process_die): Fix fall-through comments. * dbxread.c (process_one_symbol): Fix fall-through comment. * d-exp.y (lex_one_token): Fix fall-through comment. * cp-name-parser.y (yylex): Fix fall-through comment. * coffread.c (coff_symtab_read): Fix fall-through comment. * c-exp.y (lex_one_token): Fix fall-through comment. * arm-tdep.c (arm_decode_miscellaneous): Fix fall-through comment. * arch/arm.c (arm_instruction_changes_pc): Fix fall-through comment. --- gdb/ChangeLog | 31 +++++++++++++++++++++++++++++++ gdb/arch/arm.c | 3 ++- gdb/arm-tdep.c | 1 + gdb/c-exp.y | 2 +- gdb/coffread.c | 3 ++- gdb/cp-name-parser.y | 2 +- gdb/d-exp.y | 2 +- gdb/dbxread.c | 4 ++-- gdb/dwarf2read.c | 3 ++- gdb/f-exp.y | 2 +- gdb/gdbtypes.c | 6 +++--- gdb/go-exp.y | 2 +- gdb/mdebugread.c | 3 ++- gdb/msp430-tdep.c | 2 +- gdb/nat/x86-dregs.c | 2 +- gdb/p-exp.y | 2 +- gdb/remote.c | 2 +- gdb/s390-tdep.c | 6 ++++-- gdb/stabsread.c | 5 +++-- gdb/symfile.c | 2 +- gdb/xcoffread.c | 2 +- 21 files changed, 63 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f91a976..b7ae0e3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,36 @@ 2018-05-04 Tom Tromey + * s390-tdep.c (s390_process_record): Fix fall-through comments. + * xcoffread.c (scan_xcoff_symtab): Move comment later. + * symfile.c (section_is_mapped): Fix fall-through comment. + * stabsread.c (define_symbol, read_member_functions): Fix + fall-through comment. + * s390-linux-tdep.c (s390_process_record): Fix fall-through + comment. + * remote.c (remote_wait_as): Fix fall-through comment. + * p-exp.y (yylex): Fix fall-through comment. + * nat/x86-dregs.c (x86_length_and_rw_bits): Fix fall-through + comment. + * msp430-tdep.c (msp430_gdbarch_init): Fix fall-through comment. + * mdebugread.c (parse_partial_symbols): Fix fall-through comment. + * jv-exp.y (yylex): Fix fall-through comment. + * go-exp.y (lex_one_token): Fix fall-through comment. + * gdbtypes.c (get_discrete_bounds, rank_one_type): Fix + fall-through comment. + * f-exp.y (yylex): Fix fall-through comment. + * dwarf2read.c (process_die): Fix fall-through comments. + * dbxread.c (process_one_symbol): Fix fall-through comment. + * d-exp.y (lex_one_token): Fix fall-through comment. + * cp-name-parser.y (yylex): Fix fall-through comment. + * coffread.c (coff_symtab_read): Fix fall-through comment. + * c-exp.y (lex_one_token): Fix fall-through comment. + * arm-tdep.c (arm_decode_miscellaneous): Fix fall-through + comment. + * arch/arm.c (arm_instruction_changes_pc): Fix fall-through + comment. + +2018-05-04 Tom Tromey + PR python/22730: * NEWS: Mention gdb.execute change. * gdbcmd.h (execute_control_command): Don't declare. diff --git a/gdb/arch/arm.c b/gdb/arch/arm.c index 560b8cc..41c91ba 100644 --- a/gdb/arch/arm.c +++ b/gdb/arch/arm.c @@ -153,7 +153,8 @@ arm_instruction_changes_pc (uint32_t this_instr) modify PC. */ return 0; } - /* Data processing instruction. Fall through. */ + /* Data processing instruction. */ + /* Fall through. */ case 0x1: if (bits (this_instr, 12, 15) == 15) diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 463fcaf..a188f0a 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -6568,6 +6568,7 @@ arm_decode_miscellaneous (struct gdbarch *gdbarch, uint32_t insn, else if (op == 0x3) /* Not really supported. */ return arm_copy_unmodified (gdbarch, insn, "smc", dsc); + /* Fall through. */ default: return arm_copy_undef (gdbarch, insn, dsc); diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 3cee544..5e10d2a3 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -2592,7 +2592,7 @@ lex_one_token (struct parser_state *par_state, bool *is_quoted_name) last_was_structop = true; goto symbol; /* Nope, must be a symbol. */ } - /* FALL THRU into number case. */ + /* FALL THRU. */ case '0': case '1': diff --git a/gdb/coffread.c b/gdb/coffread.c index cad3e7e..192d38c 100644 --- a/gdb/coffread.c +++ b/gdb/coffread.c @@ -964,7 +964,8 @@ coff_symtab_read (minimal_symbol_reader &reader, /* At least on a 3b1, gcc generates swbeg and string labels that look like this. Ignore them. */ break; - /* Fall in for static symbols that don't start with '.' */ + /* For static symbols that don't start with '.'... */ + /* Fall through. */ case C_THUMBEXT: case C_THUMBEXTFUNC: case C_EXT: diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index f1077e3..f522e46 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -1668,7 +1668,7 @@ yylex (void) lexptr++; return '-'; } - /* FALL THRU into number case. */ + /* FALL THRU. */ try_number: case '0': diff --git a/gdb/d-exp.y b/gdb/d-exp.y index 03be93f..508927b 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -1109,7 +1109,7 @@ lex_one_token (struct parser_state *par_state) last_was_structop = 1; goto symbol; /* Nope, must be a symbol. */ } - /* FALL THRU into number case. */ + /* FALL THRU. */ case '0': case '1': diff --git a/gdb/dbxread.c b/gdb/dbxread.c index bdf4fb9..d092689 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2883,9 +2883,9 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, unknown_symtype_complaint (hex_string (type)); /* FALLTHROUGH */ - /* The following symbol types don't need the address field - relocated, since it is either unused, or is absolute. */ define_a_symbol: + /* These symbol types don't need the address field relocated, + since it is either unused, or is absolute. */ case N_GSYM: /* Global variable. */ case N_NSYMS: /* Number of symbols (Ultrix). */ case N_NOMAP: /* No map? (Ultrix). */ diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 380ff36..26ec5ef 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -10578,7 +10578,8 @@ process_die (struct die_info *die, struct dwarf2_cu *cu) cu->processing_has_namespace_info = 1; if (read_namespace_alias (die, cu)) break; - /* The declaration is not a global namespace alias: fall through. */ + /* The declaration is not a global namespace alias. */ + /* Fall through. */ case DW_TAG_imported_module: cu->processing_has_namespace_info = 1; if (die->child != NULL && (die->tag == DW_TAG_imported_declaration diff --git a/gdb/f-exp.y b/gdb/f-exp.y index ffd52cf..e39f684 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -1008,7 +1008,7 @@ yylex (void) /* Might be a floating point number. */ if (lexptr[1] < '0' || lexptr[1] > '9') goto symbol; /* Nope, must be a symbol. */ - /* FALL THRU into number case. */ + /* FALL THRU. */ case '0': case '1': diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 9ecc80f..6d70006 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1024,7 +1024,7 @@ get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp) *highp = -*lowp - 1; return 0; } - /* ... fall through for unsigned ints ... */ + /* fall through */ case TYPE_CODE_CHAR: *lowp = 0; /* This round-about calculation is to avoid shifting by @@ -4145,7 +4145,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) return INTEGER_CONVERSION_BADNESS; else if (TYPE_LENGTH (arg) < TYPE_LENGTH (parm)) return INTEGER_PROMOTION_BADNESS; - /* >>> !! else fall through !! <<< */ + /* fall through */ case TYPE_CODE_CHAR: /* Deal with signed, unsigned, and plain chars for C++ and with int cases falling through from previous case. */ @@ -4251,7 +4251,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value) rank.subrank = distance_to_ancestor (parm, arg, 0); if (rank.subrank >= 0) return sum_ranks (BASE_CONVERSION_BADNESS, rank); - /* else fall through */ + /* fall through */ default: return INCOMPATIBLE_TYPE_BADNESS; } diff --git a/gdb/go-exp.y b/gdb/go-exp.y index a96e655..936d507 100644 --- a/gdb/go-exp.y +++ b/gdb/go-exp.y @@ -1088,7 +1088,7 @@ lex_one_token (struct parser_state *par_state) last_was_structop = 1; goto symbol; /* Nope, must be a symbol. */ } - /* FALL THRU into number case. */ + /* FALL THRU. */ case '0': case '1': diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index c0bce55..59c4c89 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -3698,7 +3698,8 @@ parse_partial_symbols (minimal_symbol_reader &reader, break; default: unknown_ext_complaint (debug_info->ssext + psh->iss); - /* Fall through, pretend it's global. */ + /* Pretend it's global. */ + /* Fall through. */ case stGlobal: /* Global common symbols are resolved by the runtime loader, ignore them. */ diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c index 169b7e9..b6e062a 100644 --- a/gdb/msp430-tdep.c +++ b/gdb/msp430-tdep.c @@ -908,8 +908,8 @@ msp430_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) code_model = ca_tdep->code_model; break; } - /* Otherwise, fall through... */ } + /* Fall through. */ default: error (_("Unknown msp430 isa")); break; diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c index f11a708..7604a36 100644 --- a/gdb/nat/x86-dregs.c +++ b/gdb/nat/x86-dregs.c @@ -253,7 +253,7 @@ Invalid hardware breakpoint type %d in x86_length_and_rw_bits.\n"), case 8: if (TARGET_HAS_DR_LEN_8) return (DR_LEN_8 | rw); - /* ELSE FALL THROUGH */ + /* FALL THROUGH */ default: internal_error (__FILE__, __LINE__, _("\ Invalid hardware breakpoint length %d in x86_length_and_rw_bits.\n"), len); diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 6b857e1..d527b77 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -1224,7 +1224,7 @@ yylex (void) goto symbol; /* Nope, must be a symbol. */ } - /* FALL THRU into number case. */ + /* FALL THRU. */ case '0': case '1': diff --git a/gdb/remote.c b/gdb/remote.c index 34ae7c6..58ed9e4 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -7675,7 +7675,7 @@ remote_wait_as (ptid_t ptid, struct target_waitstatus *status, int options) putpkt (buf); break; } - /* else fallthrough */ + /* fallthrough */ default: warning (_("Invalid remote reply: %s"), buf); break; diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c index 227c709..4af035f 100644 --- a/gdb/s390-tdep.c +++ b/gdb/s390-tdep.c @@ -4318,7 +4318,8 @@ ex: return -1; break; } - /* For other instructions, fallthru. */ + /* For other instructions... */ + /* Fall through. */ default: fprintf_unfiltered (gdb_stdlog, "Warning: Unknown KM* function %02x at %s.\n", (int)tmp, paddress (gdbarch, addr)); @@ -4620,7 +4621,8 @@ ex: return -1; break; } - /* For KLMD, fallthru. */ + /* For KLMD... */ + /* Fall through. */ default: fprintf_unfiltered (gdb_stdlog, "Warning: Unknown KMAC function %02x at %s.\n", (int)tmp, paddress (gdbarch, addr)); diff --git a/gdb/stabsread.c b/gdb/stabsread.c index 0017f18..8d39290 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -723,7 +723,7 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type, /* SunPRO (3.0 at least) static variable encoding. */ if (gdbarch_static_transform_name_p (gdbarch)) goto normal; - /* ... fall through ... */ + /* fall through */ default: complaint (&symfile_complaints, _("Unknown C++ symbol name `%s'"), @@ -2532,7 +2532,8 @@ read_member_functions (struct field_info *fip, const char **pp, complaint (&symfile_complaints, _("member function type missing, got '%c'"), (*pp)[-1]); - /* Fall through into normal member function. */ + /* Normal member function. */ + /* Fall through. */ case '.': /* normal member function. */ diff --git a/gdb/symfile.c b/gdb/symfile.c index 1122db6..b0a5f11 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -2901,7 +2901,7 @@ section_is_mapped (struct obj_section *osect) if (osect->ovly_mapped == -1) gdbarch_overlay_update (gdbarch, osect); } - /* fall thru to manual case */ + /* fall thru */ case ovly_on: /* overlay debugging manual */ return osect->ovly_mapped == 1; } diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 8c707aa..66e7443 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -2531,9 +2531,9 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, } /* FALLTHROUGH */ + case C_FCN: /* C_FCN is .bf and .ef symbols. I think it is sufficient to handle only the C_FUN and C_EXT. */ - case C_FCN: case C_BSTAT: case C_ESTAT: -- cgit v1.1