diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/buildsym.c | 2 | ||||
| -rw-r--r-- | gdb/dwarf2/loc.c | 2 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 2 | ||||
| -rw-r--r-- | gdb/objfiles.c | 4 | ||||
| -rw-r--r-- | gdb/symtab.c | 2 | ||||
| -rw-r--r-- | gdb/symtab.h | 13 |
6 files changed, 17 insertions, 8 deletions
diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 8474149..1b162da 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -1022,7 +1022,7 @@ buildsym_compunit::end_symtab_with_blockvector (struct block *static_block, set_block_compunit_symtab (b, cu); } - COMPUNIT_BLOCK_LINE_SECTION (cu) = section; + cu->set_block_line_section (section); COMPUNIT_MACRO_TABLE (cu) = release_macros (); diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c index 69b480e..bf3cadb 100644 --- a/gdb/dwarf2/loc.c +++ b/gdb/dwarf2/loc.c @@ -717,7 +717,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch, { dwarf2_per_objfile *per_objfile = call_site->per_objfile; compunit_symtab *cust = per_objfile->get_symtab (call_site->per_cu); - int sect_idx = COMPUNIT_BLOCK_LINE_SECTION (cust); + int sect_idx = cust->block_line_section (); CORE_ADDR delta = per_objfile->objfile->section_offsets[sect_idx]; return call_site->target.loc_physaddr () + delta; diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 8af96c7..7958447 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -6285,7 +6285,7 @@ call_site::pc () const { compunit_symtab *cust = this->per_objfile->get_symtab (this->per_cu); CORE_ADDR delta - = this->per_objfile->objfile->section_offsets[COMPUNIT_BLOCK_LINE_SECTION (cust)]; + = this->per_objfile->objfile->section_offsets[cust->block_line_section ()]; return m_unrelocated_pc + delta; } diff --git a/gdb/objfiles.c b/gdb/objfiles.c index f363cb4..7e1ec6c 100644 --- a/gdb/objfiles.c +++ b/gdb/objfiles.c @@ -660,7 +660,7 @@ objfile_relocate1 (struct objfile *objfile, if (l) { for (int i = 0; i < l->nitems; ++i) - l->item[i].pc += delta[COMPUNIT_BLOCK_LINE_SECTION (cust)]; + l->item[i].pc += delta[cust->block_line_section ()]; } } } @@ -668,7 +668,7 @@ objfile_relocate1 (struct objfile *objfile, for (compunit_symtab *cust : objfile->compunits ()) { const struct blockvector *bv = cust->blockvector (); - int block_line_section = COMPUNIT_BLOCK_LINE_SECTION (cust); + int block_line_section = cust->block_line_section (); if (BLOCKVECTOR_MAP (bv)) addrmap_relocate (BLOCKVECTOR_MAP (bv), delta[block_line_section]); diff --git a/gdb/symtab.c b/gdb/symtab.c index a0bc1df..70a9f10 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -338,7 +338,7 @@ compunit_symtab::find_call_site (CORE_ADDR pc) const return nullptr; CORE_ADDR delta - = this->objfile ()->section_offsets[COMPUNIT_BLOCK_LINE_SECTION (this)]; + = this->objfile ()->section_offsets[this->block_line_section ()]; CORE_ADDR unrelocated_pc = pc - delta; struct call_site call_site_local (unrelocated_pc, nullptr, nullptr); diff --git a/gdb/symtab.h b/gdb/symtab.h index f9318ff..c59e3c3 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -1521,6 +1521,16 @@ 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; + } + /* Make PRIMARY_FILETAB the primary filetab of this compunit symtab. PRIMARY_FILETAB must already be a filetab of this compunit symtab. */ @@ -1578,7 +1588,7 @@ struct compunit_symtab /* Section in objfile->section_offsets for the blockvector and the linetable. Probably always SECT_OFF_TEXT. */ - int block_line_section; + 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 @@ -1616,7 +1626,6 @@ struct compunit_symtab using compunit_symtab_range = next_range<compunit_symtab>; -#define COMPUNIT_BLOCK_LINE_SECTION(cust) ((cust)->block_line_section) #define COMPUNIT_LOCATIONS_VALID(cust) ((cust)->locations_valid) #define COMPUNIT_EPILOGUE_UNWIND_VALID(cust) ((cust)->epilogue_unwind_valid) #define COMPUNIT_MACRO_TABLE(cust) ((cust)->macro_table) |