diff options
author | Tom Tromey <tom@tromey.com> | 2020-10-12 15:53:16 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2020-10-12 20:18:47 -0600 |
commit | bb2a67773c5e06545c39a6373be720c7d3d9eeb5 (patch) | |
tree | 2745316e9eb79ec610ed9e9950d56323be0bbf7d /gdb/solib.c | |
parent | 7b466b10241f3971ab628ace1e75cf1166209af5 (diff) | |
download | gdb-bb2a67773c5e06545c39a6373be720c7d3d9eeb5.zip gdb-bb2a67773c5e06545c39a6373be720c7d3d9eeb5.tar.gz gdb-bb2a67773c5e06545c39a6373be720c7d3d9eeb5.tar.bz2 |
Use a std::vector in target_section_table
This changes target_section_table to wrap a std::vector. This
simplifies some code, and also enables the simplifications coming in
the subsequent patches.
Note that for solib, I chose to have it use a pointer to a
target_section_table. This is more convoluted than would be ideal,
but I didn't want to convert solib to new/delete as a prerequisite for
this series.
gdb/ChangeLog
2020-10-12 Tom Tromey <tom@tromey.com>
* target.c (target_section_by_addr, memory_xfer_partial_1):
Update.
* target-section.h (struct target_section_table): Use
std::vector.
* symfile.h (build_section_addr_info_from_section_table): Take a
target_section_table.
* symfile.c (build_section_addr_info_from_section_table): Take a
target_section_table.
* solist.h (struct so_list) <sections>: Change type.
<sections_end>: Remove.
* solib.c (solib_map_sections, clear_so, solib_read_symbols)
(solib_contains_address_p): Update.
* solib-svr4.c (scan_dyntag): Update.
* solib-dsbt.c (scan_dyntag): Update.
* remote.c (remote_target::remote_xfer_live_readonly_partial):
Update.
* record-full.c (record_full_core_start, record_full_core_end):
Remove.
(record_full_core_sections): New global.
(record_full_core_open_1, record_full_core_target::xfer_partial):
Update.
* exec.h (build_section_table, section_table_xfer_memory_partial)
(add_target_sections): Take a target_section_table.
* exec.c (exec_file_attach, clear_section_table): Update.
(resize_section_table): Remove.
(build_section_table, add_target_sections): Take a
target_section_table.
(add_target_sections_of_objfile, remove_target_sections)
(exec_on_vfork): Update.
(section_table_available_memory): Take a target_section_table.
(section_table_read_available_memory): Update.
(section_table_xfer_memory_partial): Take a target_section_table.
(print_section_info, set_section_command)
(exec_set_section_address, exec_target::has_memory): Update.
* corelow.c (class core_target) <m_core_section_table,
m_core_file_mappings>: Remove braces.
<~core_target>: Remove.
(core_target::core_target): Update.
(core_target::~core_target): Remove.
(core_target::build_file_mappings)
(core_target::xfer_memory_via_mappings)
(core_target::xfer_partial, core_target::info_proc_mappings):
Update.
* bfd-target.c (target_bfd::xfer_partial): Update.
(target_bfd::target_bfd): Update.
(target_bfd::~target_bfd): Remove.
Diffstat (limited to 'gdb/solib.c')
-rw-r--r-- | gdb/solib.c | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/gdb/solib.c b/gdb/solib.c index cf5d05e..906e178 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -532,7 +532,6 @@ static int solib_map_sections (struct so_list *so) { const struct target_so_ops *ops = solib_ops (target_gdbarch ()); - struct target_section *p; gdb::unique_xmalloc_ptr<char> filename (tilde_expand (so->so_name)); gdb_bfd_ref_ptr abfd (ops->bfd_open (filename.get ())); @@ -553,27 +552,29 @@ solib_map_sections (struct so_list *so) error (_("Shared library file name is too long.")); strcpy (so->so_name, bfd_get_filename (so->abfd)); - if (build_section_table (so->abfd, &so->sections, &so->sections_end)) + if (so->sections == nullptr) + so->sections = new target_section_table; + if (build_section_table (so->abfd, so->sections)) { error (_("Can't find the file sections in `%s': %s"), bfd_get_filename (so->abfd), bfd_errmsg (bfd_get_error ())); } - for (p = so->sections; p < so->sections_end; p++) + for (target_section &p : so->sections->sections) { /* Relocate the section binding addresses as recorded in the shared object's file by the base address to which the object was actually mapped. */ - ops->relocate_section_addresses (so, p); + ops->relocate_section_addresses (so, &p); /* If the target didn't provide information about the address range of the shared object, assume we want the location of the .text section. */ if (so->addr_low == 0 && so->addr_high == 0 - && strcmp (p->the_bfd_section->name, ".text") == 0) + && strcmp (p.the_bfd_section->name, ".text") == 0) { - so->addr_low = p->addr; - so->addr_high = p->endaddr; + so->addr_low = p.addr; + so->addr_high = p.endaddr; } } @@ -581,7 +582,7 @@ solib_map_sections (struct so_list *so) section tables. Do this immediately after mapping the object so that later nodes in the list can query this object, as is needed in solib-osf.c. */ - add_target_sections (so, so->sections, so->sections_end); + add_target_sections (so, *so->sections); return 1; } @@ -600,11 +601,8 @@ clear_so (struct so_list *so) { const struct target_so_ops *ops = solib_ops (target_gdbarch ()); - if (so->sections) - { - xfree (so->sections); - so->sections = so->sections_end = NULL; - } + delete so->sections; + so->sections = NULL; gdb_bfd_unref (so->abfd); so->abfd = NULL; @@ -683,8 +681,7 @@ solib_read_symbols (struct so_list *so, symfile_add_flags flags) if (so->objfile == NULL) { section_addr_info sap - = build_section_addr_info_from_section_table (so->sections, - so->sections_end); + = build_section_addr_info_from_section_table (*so->sections); so->objfile = symbol_file_add_from_bfd (so->abfd, so->so_name, flags, &sap, OBJF_SHARED, NULL); @@ -1120,10 +1117,8 @@ bool solib_contains_address_p (const struct so_list *const solib, CORE_ADDR address) { - struct target_section *p; - - for (p = solib->sections; p < solib->sections_end; p++) - if (p->addr <= address && address < p->endaddr) + for (target_section &p : solib->sections->sections) + if (p.addr <= address && address < p.endaddr) return true; return false; |