diff options
Diffstat (limited to 'gdb/symtab.c')
| -rw-r--r-- | gdb/symtab.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c index d5d3877..6926d15 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1803,7 +1803,7 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile) /* We either have an OBJFILE, or we can get at it from the sym's symtab. Anything else is a bug. */ - gdb_assert (objfile || symbol_symtab (sym)); + gdb_assert (objfile || sym->symtab ()); if (objfile == NULL) objfile = sym->objfile (); @@ -3940,7 +3940,7 @@ skip_prologue_sal (struct symtab_and_line *sal) have proven the CU (Compilation Unit) supports it. sal->SYMTAB does not have to be set by the caller so we use SYM instead. */ if (sym != NULL - && symbol_symtab (sym)->compunit ()->locations_valid ()) + && sym->symtab ()->compunit ()->locations_valid ()) force_skip = 0; saved_pc = pc; @@ -4020,7 +4020,7 @@ skip_prologue_sal (struct symtab_and_line *sal) is aligned. */ if (!force_skip && sym && start_sal.symtab == NULL) { - pc = skip_prologue_using_lineinfo (pc, symbol_symtab (sym)); + pc = skip_prologue_using_lineinfo (pc, sym->symtab ()); /* Recalculate the line number. */ start_sal = find_pc_sect_line (pc, section, 0); } @@ -4052,7 +4052,7 @@ skip_prologue_sal (struct symtab_and_line *sal) && BLOCK_FUNCTION (function_block)->line () != 0) { sal->line = BLOCK_FUNCTION (function_block)->line (); - sal->symtab = symbol_symtab (BLOCK_FUNCTION (function_block)); + sal->symtab = BLOCK_FUNCTION (function_block)->symtab (); } } @@ -4692,8 +4692,8 @@ symbol_search::compare_search_syms (const symbol_search &sym_a, { int c; - c = FILENAME_CMP (symbol_symtab (sym_a.symbol)->filename, - symbol_symtab (sym_b.symbol)->filename); + c = FILENAME_CMP (sym_a.symbol->symtab ()->filename, + sym_b.symbol->symtab ()->filename); if (c != 0) return c; @@ -4873,7 +4873,7 @@ global_symbol_searcher::add_matching_symbols ALL_BLOCK_SYMBOLS (b, iter, sym) { - struct symtab *real_symtab = symbol_symtab (sym); + struct symtab *real_symtab = sym->symtab (); QUIT; @@ -5146,7 +5146,7 @@ print_symbol_info (enum search_domain kind, int block, const char *last) { scoped_switch_to_sym_language_if_auto l (sym); - struct symtab *s = symbol_symtab (sym); + struct symtab *s = sym->symtab (); if (last != NULL) { @@ -5266,7 +5266,7 @@ symtab_symbol_info (bool quiet, bool exclude_minsyms, p.block, last_filename); last_filename - = symtab_to_filename_for_display (symbol_symtab (p.symbol)); + = symtab_to_filename_for_display (p.symbol->symtab ()); } } } @@ -5486,7 +5486,7 @@ rbreak_command (const char *regexp, int from_tty) { if (p.msymbol.minsym == NULL) { - struct symtab *symtab = symbol_symtab (p.symbol); + struct symtab *symtab = p.symbol->symtab (); const char *fullname = symtab_to_fullname (symtab); string = string_printf ("%s:'%s'", fullname, @@ -6612,19 +6612,19 @@ symbol::arch () const /* See symtab.h. */ struct symtab * -symbol_symtab (const struct symbol *symbol) +symbol::symtab () const { - gdb_assert (symbol->is_objfile_owned ()); - return symbol->owner.symtab; + gdb_assert (is_objfile_owned ()); + return owner.symtab; } /* See symtab.h. */ void -symbol_set_symtab (struct symbol *symbol, struct symtab *symtab) +symbol::set_symtab (struct symtab *symtab) { - gdb_assert (symbol->is_objfile_owned ()); - symbol->owner.symtab = symtab; + gdb_assert (is_objfile_owned ()); + owner.symtab = symtab; } /* See symtab.h. */ @@ -6870,7 +6870,7 @@ info_module_subcommand (bool quiet, const char *module_regexp, print_symbol_info (FUNCTIONS_DOMAIN, q.symbol, q.block, last_filename); last_filename - = symtab_to_filename_for_display (symbol_symtab (q.symbol)); + = symtab_to_filename_for_display (q.symbol->symtab ()); } } |