diff options
| author | Tom Tromey <tromey@adacore.com> | 2023-01-10 11:39:50 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@adacore.com> | 2023-02-08 08:20:12 -0700 |
| commit | 3f01c12b9006227529823a07aee8a21627da63dd (patch) | |
| tree | 373b0bbf320051f13d80a749bb1e226b2a885de2 /gdb | |
| parent | 1947a4a4bb7651a4656edceb1f9b246f96f89ebd (diff) | |
| download | gdb-3f01c12b9006227529823a07aee8a21627da63dd.zip gdb-3f01c12b9006227529823a07aee8a21627da63dd.tar.gz gdb-3f01c12b9006227529823a07aee8a21627da63dd.tar.bz2 | |
Use default section indexes in fixup_symbol_section
If fixup_section does not find a matching section, it arbitrarily
chooses the first one. However, it seems better to make this default
depend on the type of the symbol -- i.e., default data symbols to
.data and text symbols to .text.
I've also made fixup_section static, as it only has one caller.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/symtab.c | 22 | ||||
| -rw-r--r-- | gdb/symtab.h | 3 |
2 files changed, 17 insertions, 8 deletions
diff --git a/gdb/symtab.c b/gdb/symtab.c index 4cc0d023..a120c1d 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1703,11 +1703,16 @@ symtab_free_objfile_observer (struct objfile *objfile) } /* Debug symbols usually don't have section information. We need to dig that - out of the minimal symbols and stash that in the debug symbol. */ + out of the minimal symbols and stash that in the debug symbol. -void + DEFAULT_SECTION is the section index to use as the default if the + correct section cannot be found. It may be -1, in which case a + built-in default is used. */ + +static void fixup_section (struct general_symbol_info *ginfo, - CORE_ADDR addr, struct objfile *objfile) + CORE_ADDR addr, struct objfile *objfile, + int default_section) { struct minimal_symbol *msym; @@ -1758,7 +1763,7 @@ fixup_section (struct general_symbol_info *ginfo, a search of the section table. */ struct obj_section *s; - int fallback = -1; + int fallback = default_section; ALL_OBJFILE_OSECTIONS (objfile, s) { @@ -1809,9 +1814,16 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile) /* We should have an objfile by now. */ gdb_assert (objfile); + /* Note that if this ends up as -1, fixup_section will handle that + reasonably well. So, it's fine to use the objfile's section + index without doing the check that is done by the wrapper macros + like SECT_OFF_TEXT. */ + int default_section = objfile->sect_index_text; switch (sym->aclass ()) { case LOC_STATIC: + default_section = objfile->sect_index_data; + /* FALLTHROUGH. */ case LOC_LABEL: addr = sym->value_address (); break; @@ -1825,7 +1837,7 @@ fixup_symbol_section (struct symbol *sym, struct objfile *objfile) return sym; } - fixup_section (sym, addr, objfile); + fixup_section (sym, addr, objfile, default_section); return sym; } diff --git a/gdb/symtab.h b/gdb/symtab.h index 3ba40bd..484644f 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -2608,9 +2608,6 @@ extern struct block_symbol compiler (armcc). */ bool producer_is_realview (const char *producer); -void fixup_section (struct general_symbol_info *ginfo, - CORE_ADDR addr, struct objfile *objfile); - extern unsigned int symtab_create_debug; /* Print a "symtab-create" debug statement. */ |