diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-02-05 22:01:48 +0000 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2021-02-10 14:38:08 +0000 |
| commit | ebbc3a7d56f82f68bbeece3d7daf1823c9d98170 (patch) | |
| tree | 07d4658bb23d7c55f074c9a2cf7fb0141f389948 /gdb/symtab.c | |
| parent | 52ff20fe7ba8e8de2660339fff5308ed932e2b32 (diff) | |
| download | gdb-ebbc3a7d56f82f68bbeece3d7daf1823c9d98170.zip gdb-ebbc3a7d56f82f68bbeece3d7daf1823c9d98170.tar.gz gdb-ebbc3a7d56f82f68bbeece3d7daf1823c9d98170.tar.bz2 | |
gdb: Delete SYMBOL_OBJ_SECTION and MSYMBOL_OBJ_SECTION
Replace the two macros SYMBOL_OBJ_SECTION and MSYMBOL_OBJ_SECTION with
a member function on general_symbol_info.
There should be no user visible change after this commit.
gdb/ChangeLog:
* breakpoint.c (resolve_sal_pc): Replace SYMBOL_OBJ_SECTION and
MSYMBOL_OBJ_SECTION.
* findvar.c (language_defn::read_var_value): Likewise.
* infcmd.c (jump_command): Likewise.
* linespec.c (minsym_found): Likewise.
* maint.c (maintenance_translate_address): Likewise.
* minsyms.c (lookup_minimal_symbol_by_pc_section): Likewise.
(minimal_symbol_upper_bound): Likewise.
* parse.c (find_minsym_type_and_address): Likewise.
(operator_check_standard): Likewise.
* printcmd.c (info_address_command): Likewise.
* symmisc.c (dump_msymbols): Likewise.
(print_symbol): Likewise.
* symtab.c (general_symbol_info::obj_section): Define new
function.
(fixup_symbol_section): Replace SYMBOL_OBJ_SECTION.
(find_pc_sect_compunit_symtab): Likewise.
(find_function_start_sal): Likewise.
(skip_prologue_sal): Replace SYMBOL_OBJ_SECTION and
MSYMBOL_OBJ_SECTION.
* symtab.h (struct general_symbol_info) <obj_section>: Declare new
function.
(SYMBOL_OBJ_SECTION): Delete.
(MSYMBOL_OBJ_SECTION): Delete.
Diffstat (limited to 'gdb/symtab.c')
| -rw-r--r-- | gdb/symtab.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c index 7ffb52a..9ad7c1f 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1012,6 +1012,16 @@ general_symbol_info::search_name () const /* See symtab.h. */ +struct obj_section * +general_symbol_info::obj_section (const struct objfile *objfile) const +{ + if (section >= 0) + return &objfile->sections[section]; + return nullptr; +} + +/* See symtab.h. */ + bool symbol_matches_search_name (const struct general_symbol_info *gsymbol, const lookup_name_info &name) @@ -1730,7 +1740,7 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile) if (objfile == NULL) objfile = symbol_objfile (sym); - if (SYMBOL_OBJ_SECTION (objfile, sym)) + if (sym->obj_section (objfile) != nullptr) return sym; /* We should have an objfile by now. */ @@ -2972,8 +2982,7 @@ find_pc_sect_compunit_symtab (CORE_ADDR pc, struct obj_section *section) ALL_BLOCK_SYMBOLS (b, iter, sym) { fixup_symbol_section (sym, obj_file); - if (matching_obj_sections (SYMBOL_OBJ_SECTION (obj_file, - sym), + if (matching_obj_sections (sym->obj_section (obj_file), section)) break; } @@ -3732,7 +3741,7 @@ find_function_start_sal (symbol *sym, bool funfirstline) fixup_symbol_section (sym, NULL); symtab_and_line sal = find_function_start_sal_1 (BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym)), - SYMBOL_OBJ_SECTION (symbol_objfile (sym), sym), + sym->obj_section (symbol_objfile (sym)), funfirstline); sal.symbol = sym; return sal; @@ -3823,7 +3832,7 @@ skip_prologue_sal (struct symtab_and_line *sal) objfile = symbol_objfile (sym); pc = BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (sym)); - section = SYMBOL_OBJ_SECTION (objfile, sym); + section = sym->obj_section (objfile); name = sym->linkage_name (); } else @@ -3836,7 +3845,7 @@ skip_prologue_sal (struct symtab_and_line *sal) objfile = msymbol.objfile; pc = BMSYMBOL_VALUE_ADDRESS (msymbol); - section = MSYMBOL_OBJ_SECTION (objfile, msymbol.minsym); + section = msymbol.minsym->obj_section (objfile); name = msymbol.minsym->linkage_name (); } |