From 6d94535fc68e1fd06816c5685166ebcec56119ce Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Oct 2019 16:47:27 -0600 Subject: [PATCH] Change some psymtab fields to bool This changes a few fields in partial_symtab to have type bool. gdb/ChangeLog 2020-01-26 Tom Tromey * xcoffread.c (xcoff_psymtab_to_symtab_1): Update. * psymtab.c (psym_print_stats): Update. * psympriv.h (struct partial_symtab) : Now bool. * mdebugread.c (psymtab_to_symtab_1): Update. * dwarf2read.c (create_type_unit_group, create_partial_symtab) (build_type_psymtabs_reader, psymtab_to_symtab_1) (process_full_comp_unit, process_full_type_unit): Update. * dbxread.c (dbx_psymtab_to_symtab_1): Update. * ctfread.c (psymtab_to_symtab): Update. Change-Id: I206761d083493589049ea0bc785ed6542339234d --- gdb/ChangeLog | 13 +++++++++++++ gdb/ctfread.c | 2 +- gdb/dbxread.c | 2 +- gdb/dwarf2read.c | 12 ++++++------ gdb/mdebugread.c | 2 +- gdb/psympriv.h | 12 ++++++------ gdb/psymtab.c | 2 +- gdb/xcoffread.c | 2 +- 8 files changed, 30 insertions(+), 17 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7be36c11b5..345a81c935 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2020-01-26 Tom Tromey + + * xcoffread.c (xcoff_psymtab_to_symtab_1): Update. + * psymtab.c (psym_print_stats): Update. + * psympriv.h (struct partial_symtab) : Now bool. + * mdebugread.c (psymtab_to_symtab_1): Update. + * dwarf2read.c (create_type_unit_group, create_partial_symtab) + (build_type_psymtabs_reader, psymtab_to_symtab_1) + (process_full_comp_unit, process_full_type_unit): Update. + * dbxread.c (dbx_psymtab_to_symtab_1): Update. + * ctfread.c (psymtab_to_symtab): Update. + 2020-01-26 Tom Tromey * mdebugread.c (parse_partial_symbols): Use discard_psymtab. diff --git a/gdb/ctfread.c b/gdb/ctfread.c index f3c067ee0b..c41d96f3e5 100644 --- a/gdb/ctfread.c +++ b/gdb/ctfread.c @@ -1241,7 +1241,7 @@ psymtab_to_symtab (struct partial_symtab *pst) set_symbol_address (ccp->of, sym, sym->linkage_name ()); } - pst->readin = 1; + pst->readin = true; } /* Expand partial symbol table PST into a full symbol table. diff --git a/gdb/dbxread.c b/gdb/dbxread.c index bec622a10f..d4d7901e91 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -2108,7 +2108,7 @@ dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) read_ofile_symtab (objfile, pst); } - pst->readin = 1; + pst->readin = true; } /* Read in all of the symbols for a given psymtab for real. diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index a81a77aa50..63944105ed 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -7945,7 +7945,7 @@ create_type_unit_group (struct dwarf2_cu *cu, sect_offset line_offset_struct) name = string_printf ("", line_offset); pst = create_partial_symtab (per_cu, name.c_str ()); - pst->anonymous = 1; + pst->anonymous = true; } tu_group->hash.dwo_unit = cu->dwo_unit; @@ -8029,7 +8029,7 @@ create_partial_symtab (struct dwarf2_per_cu_data *per_cu, const char *name) pst = start_psymtab_common (objfile, name, 0); - pst->psymtabs_addrmap_supported = 1; + pst->psymtabs_addrmap_supported = true; /* This is the glue that links PST into GDB's symbol API. */ pst->read_symtab_private = per_cu; @@ -8241,7 +8241,7 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader, prepare_one_comp_unit (cu, type_unit_die, language_minimal); pst = create_partial_symtab (per_cu, ""); - pst->anonymous = 1; + pst->anonymous = true; first_die = load_partial_dies (reader, info_ptr, 1); @@ -9720,7 +9720,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst) { /* It's an include file, no symbols to read for it. Everything is in the parent symtab. */ - pst->readin = 1; + pst->readin = true; return; } @@ -10479,7 +10479,7 @@ process_full_comp_unit (struct dwarf2_per_cu_data *per_cu, { struct partial_symtab *pst = per_cu->v.psymtab; pst->compunit_symtab = cust; - pst->readin = 1; + pst->readin = true; } /* Push it for inclusion processing later. */ @@ -10559,7 +10559,7 @@ process_full_type_unit (struct dwarf2_per_cu_data *per_cu, { struct partial_symtab *pst = per_cu->v.psymtab; pst->compunit_symtab = cust; - pst->readin = 1; + pst->readin = true; } /* Not needed any more. */ diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index 393a433792..f28c0b25cb 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -3862,7 +3862,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (pst->readin) return; - pst->readin = 1; + pst->readin = true; /* Read in all partial symtabs on which this one is dependent. NOTE that we do have circular dependencies, sigh. We solved diff --git a/gdb/psympriv.h b/gdb/psympriv.h index dc89db2ff6..ce28112439 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -239,21 +239,21 @@ struct partial_symtab int statics_offset = 0; int n_static_syms = 0; - /* Non-zero if the symtab corresponding to this psymtab has been - readin. This is located here so that this structure packs better - on 64-bit systems. */ + /* True if the symtab corresponding to this psymtab has been readin. + This is located here so that this structure packs better on + 64-bit systems. */ - unsigned char readin = 0; + bool readin = false; /* True iff objfile->psymtabs_addrmap is properly populated for this partial_symtab. For discontiguous overlapping psymtabs is the only usable info in PSYMTABS_ADDRMAP. */ - unsigned char psymtabs_addrmap_supported = 0; + bool psymtabs_addrmap_supported = false; /* True if the name of this partial symtab is not a source file name. */ - unsigned char anonymous = 0; + bool anonymous = false; /* A flag that is temporarily used when searching psymtabs. */ diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 5f428679fb..037ed19182 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1005,7 +1005,7 @@ psym_print_stats (struct objfile *objfile) i = 0; for (partial_symtab *ps : require_partial_symbols (objfile, true)) { - if (ps->readin == 0) + if (!ps->readin) i++; } printf_filtered (_(" Number of psym tables (not yet expanded): %d\n"), i); diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 66ace43051..27e49f755e 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -1859,7 +1859,7 @@ xcoff_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) read_xcoff_symtab (objfile, pst); } - pst->readin = 1; + pst->readin = true; } /* Read in all of the symbols for a given psymtab for real. -- 2.34.1