From 6be2a9ab1fba5f876c8cb2566280c5e4e6959d6e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 29 Oct 2020 15:04:33 -0600 Subject: [PATCH] Add target_section constructor This adds a constructor to target_section, simplifying the code that creates instances of this. gdb/ChangeLog 2020-10-29 Tom Tromey * target-section.h (struct target_section): Add constructor. * exec.c (build_section_table, add_target_sections_of_objfile): Update. * corelow.c (core_target::build_file_mappings): Update. --- gdb/ChangeLog | 7 +++++++ gdb/corelow.c | 7 +------ gdb/exec.c | 18 ++++++------------ gdb/target-section.h | 9 +++++++++ 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3cef0093300..e282ea7f604 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2020-10-29 Tom Tromey + + * target-section.h (struct target_section): Add constructor. + * exec.c (build_section_table, add_target_sections_of_objfile): + Update. + * corelow.c (core_target::build_file_mappings): Update. + 2020-10-29 Tankut Baris Aktemur PR gdb/19318 diff --git a/gdb/corelow.c b/gdb/corelow.c index a54d81571aa..4f3c8802020 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -266,12 +266,7 @@ core_target::build_file_mappings () bfd_set_section_alignment (sec, 2); /* Set target_section fields. */ - m_core_file_mappings.emplace_back (); - target_section &ts = m_core_file_mappings.back (); - ts.addr = start; - ts.endaddr = end; - ts.owner = nullptr; - ts.the_bfd_section = sec; + m_core_file_mappings.emplace_back (start, end, sec); }); normalize_mem_ranges (&m_core_unavailable_mappings); diff --git a/gdb/exec.c b/gdb/exec.c index f95fdce67f8..9bdd87d0eaa 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -598,12 +598,9 @@ build_section_table (struct bfd *some_bfd) if (!(aflag & SEC_ALLOC)) continue; - table.emplace_back (); - target_section § = table.back (); - sect.owner = NULL; - sect.the_bfd_section = asect; - sect.addr = bfd_section_vma (asect); - sect.endaddr = sect.addr + bfd_section_size (asect); + table.emplace_back (bfd_section_vma (asect), + bfd_section_vma (asect) + bfd_section_size (asect), + asect); } return table; @@ -662,12 +659,9 @@ add_target_sections_of_objfile (struct objfile *objfile) if (bfd_section_size (osect->the_bfd_section) == 0) continue; - table->emplace_back (); - target_section &ts = table->back (); - ts.addr = obj_section_addr (osect); - ts.endaddr = obj_section_endaddr (osect); - ts.the_bfd_section = osect->the_bfd_section; - ts.owner = (void *) objfile; + table->emplace_back (obj_section_addr (osect), + obj_section_endaddr (osect), + osect->the_bfd_section, (void *) objfile); } } diff --git a/gdb/target-section.h b/gdb/target-section.h index ec6932da0a6..b19bcf9e997 100644 --- a/gdb/target-section.h +++ b/gdb/target-section.h @@ -26,6 +26,15 @@ struct target_section { + target_section (CORE_ADDR addr_, CORE_ADDR end_, struct bfd_section *sect_, + void *owner_ = nullptr) + : addr (addr_), + endaddr (end_), + the_bfd_section (sect_), + owner (owner_) + { + } + /* Lowest address in section. */ CORE_ADDR addr; /* Highest address in section, plus 1. */ -- 2.30.2