espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-31 05:44:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

2010-01-06 Tristan Gingold <gingold@adacore.com>

Browse Source 
* symtab.c (lookup_global_symbol_from_objfile): Rename objfile
	parameter to main_objfile.  Iterate on all separate debug objfiles.
	* symfile.h (symbol_file_add_separate)
	(find_separate_debug_file_by_debuglink): Remove parameter names.
	* symfile.c (symbol_file_add_separate): Use add_separate_objfile.
	(reread_symbols): Use free_objfile_separate_debug.
	* objfiles.h (struct objfile): Add separate_debug_objfile_link.
	Adjust comment.
	(objfile_separate_debug_iterate, add_separate_debug_objfile)
	(free_objfile_separate_debug): New prototypes.
	* objfiles.c (objfile_separate_debug_iterate): New function.
	(add_separate_debug_objfile, free_objfile_separate_debug): New
	functions.
	(free_objfile): Use free_objfile_separate_debug.  Adjust for
	multiple separate debug objfile.
	(objfile_has_symbols): Adjust comment.  Iterate on all separate
	debug objfiles.
	* minsyms.c (lookup_minimal_symbol): Adjust for multiple separate
	debug objfile.
	(lookup_minimal_symbol_text): Ditto.
	(lookup_minimal_symbol_by_pc_name): Ditto.
	(lookup_minimal_symbol_solib_trampoline): Ditto.
	(lookup_minimal_symbol_by_pc_section_1): Iterate on all separate
	debug objfiles.
This commit is contained in:
Tristan Gingold
2010-01-06 10:11:04 +00:00
parent d2ca6b5b42
commit 15d123c99f
7 changed files with 199 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
gdb/objfiles.c
View File

@ -378,6 +378,42 @@ terminate_minimal_symbol_table (struct objfile *objfile)
}
}
/* Iterator on PARENT and every separate debug objfile of PARENT.
The usage pattern is:
for (objfile = parent;
objfile;
objfile = objfile_separate_debug_iterate (parent, objfile))
...
*/
struct objfile *
objfile_separate_debug_iterate (const struct objfile *parent,
const struct objfile *objfile)
{
struct objfile *res;
res = objfile->separate_debug_objfile;
if (res)
return res;
res = objfile->separate_debug_objfile_link;
if (res)
return res;
/* Common case where there is no separate debug objfile. */
if (objfile == parent)
return NULL;
for (res = objfile->separate_debug_objfile_backlink;
res != parent;
res = res->separate_debug_objfile_backlink)
{
gdb_assert (res != NULL);
if (res->separate_debug_objfile_link)
return res->separate_debug_objfile_link;
}
return NULL;
}
/* Put one object file before a specified on in the global list.
This can be used to make sure an object file is destroyed before
@ -455,6 +491,41 @@ unlink_objfile (struct objfile *objfile)
_("unlink_objfile: objfile already unlinked"));
}
/* Add OBJFILE as a separate debug objfile of PARENT. */
void
add_separate_debug_objfile (struct objfile *objfile, struct objfile *parent)
{
gdb_assert (objfile && parent);
/* Must not be already in a list. */
gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
gdb_assert (objfile->separate_debug_objfile_link == NULL);
objfile->separate_debug_objfile_backlink = parent;
objfile->separate_debug_objfile_link = parent->separate_debug_objfile;
parent->separate_debug_objfile = objfile;
/* Put the separate debug object before the normal one, this is so that
usage of the ALL_OBJFILES_SAFE macro will stay safe. */
put_objfile_before (objfile, parent);
}
/* Free all separate debug objfile of OBJFILE, but don't free OBJFILE
itself. */
void
free_objfile_separate_debug (struct objfile *objfile)
{
struct objfile *child;
for (child = objfile->separate_debug_objfile; child;)
{
struct objfile *next_child = child->separate_debug_objfile_link;
free_objfile (child);
child = next_child;
}
}
/* Destroy an objfile and all the symtabs and psymtabs under it. Note
that as much as possible is allocated on the objfile_obstack
@ -475,16 +546,38 @@ unlink_objfile (struct objfile *objfile)
void
free_objfile (struct objfile *objfile)
{
if (objfile->separate_debug_objfile)
{
free_objfile (objfile->separate_debug_objfile);
}
/* Free all separate debug objfiles. */
free_objfile_separate_debug (objfile);
if (objfile->separate_debug_objfile_backlink)
{
/* We freed the separate debug file, make sure the base objfile
doesn't reference it. */
objfile->separate_debug_objfile_backlink->separate_debug_objfile = NULL;
struct objfile *child;
child = objfile->separate_debug_objfile_backlink->separate_debug_objfile;
if (child == objfile)
{
/* OBJFILE is the first child. */
objfile->separate_debug_objfile_backlink->separate_debug_objfile =
objfile->separate_debug_objfile_link;
}
else
{
/* Find OBJFILE in the list. */
while (1)
{
if (child->separate_debug_objfile_link == objfile)
{
child->separate_debug_objfile_link =
objfile->separate_debug_objfile_link;
break;
}
child = child->separate_debug_objfile_link;
gdb_assert (child);
}
}
}
/* Remove any references to this objfile in the global value
@ -778,25 +871,16 @@ objfile_has_full_symbols (struct objfile *objfile)
}
/* Return non-zero if OBJFILE has full or partial symbols, either directly
or throught its separate debug file. */
or through a separate debug file. */
int
objfile_has_symbols (struct objfile *objfile)
{
struct objfile *separate_objfile;
if (objfile_has_partial_symbols (objfile)
|| objfile_has_full_symbols (objfile))
return 1;
separate_objfile = objfile->separate_debug_objfile;
if (separate_objfile == NULL)
return 0;
if (objfile_has_partial_symbols (separate_objfile)
|| objfile_has_full_symbols (separate_objfile))
return 1;
struct objfile *o;
for (o = objfile; o; o = objfile_separate_debug_iterate (objfile, o))
if (objfile_has_partial_symbols (o) || objfile_has_full_symbols (o))
return 1;
return 0;
}