Remove compunit_symtab::m_block_line_section

The previous patch hard-coded SECT_OFF_TEXT into the buildsym code.
After this, it's clear that there is only one caller of
compunit_symtab::set_block_line_section, and it always passes
SECT_OFF_TEXT.  So, remove compunit_symtab::m_block_line_section and
use SECT_OFF_TEXT instead.
This commit is contained in:
Tom Tromey
2023-01-19 06:14:49 -07:00
parent 83bad3162d
commit d401e7bf04
6 changed files with 6 additions and 29 deletions
-2
View File
@@ -974,8 +974,6 @@ buildsym_compunit::end_compunit_symtab_with_blockvector
set_block_compunit_symtab (b, cu);
}
cu->set_block_line_section (SECT_OFF_TEXT (m_objfile));
cu->set_macro_table (release_macros ());
/* Default any symbols without a specified symtab to the primary symtab. */
+2 -6
View File
@@ -718,9 +718,7 @@ call_site_target::iterate_over_addresses
case call_site_target::PHYSADDR:
{
dwarf2_per_objfile *per_objfile = call_site->per_objfile;
compunit_symtab *cust = per_objfile->get_symtab (call_site->per_cu);
int sect_idx = cust->block_line_section ();
CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx];
CORE_ADDR delta = per_objfile->objfile->text_section_offset ();
callback (m_loc.physaddr + delta);
}
@@ -729,9 +727,7 @@ call_site_target::iterate_over_addresses
case call_site_target::ADDRESSES:
{
dwarf2_per_objfile *per_objfile = call_site->per_objfile;
compunit_symtab *cust = per_objfile->get_symtab (call_site->per_cu);
int sect_idx = cust->block_line_section ();
CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx];
CORE_ADDR delta = per_objfile->objfile->text_section_offset ();
for (unsigned i = 0; i < m_loc.addresses.length; ++i)
callback (m_loc.addresses.values[i] + delta);
+1 -3
View File
@@ -6436,9 +6436,7 @@ objfile_type (struct objfile *objfile)
CORE_ADDR
call_site::pc () const
{
compunit_symtab *cust = this->per_objfile->get_symtab (this->per_cu);
CORE_ADDR delta
= this->per_objfile->objfile->section_offsets[cust->block_line_section ()];
CORE_ADDR delta = this->per_objfile->objfile->text_section_offset ();
return m_unrelocated_pc + delta;
}
+2 -2
View File
@@ -629,7 +629,7 @@ objfile_relocate1 (struct objfile *objfile,
if (l)
{
for (int i = 0; i < l->nitems; ++i)
l->item[i].pc += delta[cust->block_line_section ()];
l->item[i].pc += delta[SECT_OFF_TEXT (objfile)];
}
}
}
@@ -637,7 +637,7 @@ objfile_relocate1 (struct objfile *objfile,
for (compunit_symtab *cust : objfile->compunits ())
{
struct blockvector *bv = cust->blockvector ();
int block_line_section = cust->block_line_section ();
int block_line_section = SECT_OFF_TEXT (objfile);
if (bv->map () != nullptr)
bv->map ()->relocate (delta[block_line_section]);
+1 -2
View File
@@ -342,8 +342,7 @@ compunit_symtab::find_call_site (CORE_ADDR pc) const
if (m_call_site_htab == nullptr)
return nullptr;
CORE_ADDR delta
= this->objfile ()->section_offsets[this->block_line_section ()];
CORE_ADDR delta = this->objfile ()->text_section_offset ();
CORE_ADDR unrelocated_pc = pc - delta;
struct call_site call_site_local (unrelocated_pc, nullptr, nullptr);
-14
View File
@@ -1786,16 +1786,6 @@ struct compunit_symtab
m_blockvector = blockvector;
}
int block_line_section () const
{
return m_block_line_section;
}
void set_block_line_section (int block_line_section)
{
m_block_line_section = block_line_section;
}
bool locations_valid () const
{
return m_locations_valid;
@@ -1884,10 +1874,6 @@ struct compunit_symtab
all symtabs in a given compilation unit. */
struct blockvector *m_blockvector;
/* Section in objfile->section_offsets for the blockvector and
the linetable. Probably always SECT_OFF_TEXT. */
int m_block_line_section;
/* Symtab has been compiled with both optimizations and debug info so that
GDB may stop skipping prologues as variables locations are valid already
at function entry points. */