Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

From Craig Silverstein: rework DWARF reader code a bit.

Browse Source
This commit is contained in:
Ian Lance Taylor
2007-11-12 19:56:20 +00:00
parent 386c048c7a
commit 24badc6562
3 changed files with 88 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
gold/object.cc
View File

@@ -1093,57 +1093,9 @@ Relocate_info<size, big_endian>::location(size_t, off_t offset) const
std::string filename;
std::string file_and_lineno; // Better than filename-only, if available.
// The line-number information is in the ".debug_line" section.
unsigned int debug_shndx;
off_t debuglines_size;
const unsigned char* debuglines = NULL;
for (debug_shndx = 0; debug_shndx < this->object->shnum(); ++debug_shndx)
if (this->object->section_name(debug_shndx) == ".debug_line")
{
debuglines = this->object->section_contents(
debug_shndx, &debuglines_size, false);
break;
}
// Find the relocation section for ".debug_line".
Track_relocs<size, big_endian> track_relocs;
bool got_relocs = false;
for (unsigned int reloc_shndx = 0;
reloc_shndx < this->object->shnum();
++reloc_shndx)
{
unsigned int reloc_sh_type = this->object->section_type(reloc_shndx);
if ((reloc_sh_type == elfcpp::SHT_REL
|| reloc_sh_type == elfcpp::SHT_RELA)
&& this->object->section_info(reloc_shndx) == debug_shndx)
{
got_relocs = track_relocs.initialize(this->object, reloc_shndx,
reloc_sh_type);
break;
}
}
// Finally, we need the symtab section to interpret the relocs.
unsigned int symtab_shndx;
off_t symtab_size;
const unsigned char* symtab = NULL;
for (symtab_shndx = 0; symtab_shndx < this->object->shnum(); ++symtab_shndx)
if (this->object->section_type(symtab_shndx) == elfcpp::SHT_SYMTAB)
{
symtab = this->object->section_contents(
symtab_shndx, &symtab_size, false);
break;
}
// If we got all three sections we need, we can try to read debug info.
if (debuglines != NULL && got_relocs && symtab != NULL)
{
Dwarf_line_info<size, big_endian> line_info(debuglines, debuglines_size,
&track_relocs,
symtab, symtab_size);
line_info.read_line_mappings();
file_and_lineno = line_info.addr2line(this->data_shndx, offset);
}
Dwarf_line_info<size, big_endian> line_info(this->object);
// This will be "" if we failed to parse the debug info for any reason.
file_and_lineno = line_info.addr2line(this->data_shndx, offset);
std::string ret(this->object->name());
ret += ':';