diff options
| -rw-r--r-- | gdb/exec.c | 16 | ||||
| -rw-r--r-- | gdb/maint.c | 2 | ||||
| -rw-r--r-- | gdb/progspace.c | 3 | ||||
| -rw-r--r-- | gdb/progspace.h | 4 | ||||
| -rw-r--r-- | gdb/solib.c | 2 | ||||
| -rw-r--r-- | gdb/target-section.h | 42 |
6 files changed, 51 insertions, 18 deletions
@@ -492,8 +492,8 @@ exec_file_attach (const char *filename, int from_tty) /* Add the executable's sections to the current address spaces' list of sections. This possibly pushes the exec_ops target. */ - current_program_space->add_target_sections (¤t_program_space->ebfd, - sections); + current_program_space->add_target_sections + (current_program_space->ebfd.get (), sections); /* Tell display code (if any) about the changed file name. */ if (deprecated_exec_file_display_hook) @@ -599,8 +599,8 @@ build_section_table (struct bfd *some_bfd) current set of target sections. */ void -program_space::add_target_sections (const void *owner, - const std::vector<target_section> §ions) +program_space::add_target_sections + (target_section_owner owner, const std::vector<target_section> §ions) { if (!sections.empty ()) { @@ -643,7 +643,7 @@ program_space::add_target_sections (struct objfile *objfile) continue; m_target_sections.emplace_back (osect->addr (), osect->endaddr (), - osect->the_bfd_section, (void *) objfile); + osect->the_bfd_section, objfile); } } @@ -651,15 +651,15 @@ program_space::add_target_sections (struct objfile *objfile) OWNER must be the same value passed to add_target_sections. */ void -program_space::remove_target_sections (const void *owner) +program_space::remove_target_sections (target_section_owner owner) { - gdb_assert (owner != NULL); + gdb_assert (owner.v () != nullptr); auto it = std::remove_if (m_target_sections.begin (), m_target_sections.end (), [&] (target_section §) { - return sect.owner == owner; + return sect.owner.v () == owner.v (); }); m_target_sections.erase (it, m_target_sections.end ()); diff --git a/gdb/maint.c b/gdb/maint.c index e0dc5bc..0635af3 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -509,7 +509,7 @@ maintenance_info_target_sections (const char *arg, int from_tty) (8 + digits), "", hex_string_custom (sec.addr, addr_size), hex_string_custom (sec.endaddr, addr_size), - sec.owner); + sec.owner.v ()); } } diff --git a/gdb/progspace.c b/gdb/progspace.c index cca651f..839707e 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -207,10 +207,11 @@ program_space::exec_close () { /* Removing target sections may close the exec_ops target. Clear ebfd before doing so to prevent recursion. */ + bfd *saved_ebfd = ebfd.get (); ebfd.reset (nullptr); ebfd_mtime = 0; - remove_target_sections (&ebfd); + remove_target_sections (saved_ebfd); exec_filename.reset (nullptr); } diff --git a/gdb/progspace.h b/gdb/progspace.h index a480f56..a22e427 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -284,11 +284,11 @@ struct program_space bool empty (); /* Remove all target sections owned by OWNER. */ - void remove_target_sections (const void *owner); + void remove_target_sections (target_section_owner owner); /* Add the sections array defined by SECTIONS to the current set of target sections. */ - void add_target_sections (const void *owner, + void add_target_sections (target_section_owner owner, const std::vector<target_section> §ions); /* Add the sections of OBJFILE to the current set of target diff --git a/gdb/solib.c b/gdb/solib.c index 7197063..b9fb911 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -1195,7 +1195,7 @@ clear_solib (void) current_program_space->so_list.clear_and_dispose ([] (shobj *so) { notify_solib_unloaded (current_program_space, *so); - current_program_space->remove_target_sections (&so); + current_program_space->remove_target_sections (so); delete so; }); diff --git a/gdb/target-section.h b/gdb/target-section.h index 1c902ba..62149d3 100644 --- a/gdb/target-section.h +++ b/gdb/target-section.h @@ -20,6 +20,38 @@ #ifndef GDB_TARGET_SECTION_H #define GDB_TARGET_SECTION_H +struct bfd; +struct objfile; +struct shobj; + +/* A union representing the possible owner types of a target_section. */ + +union target_section_owner +{ + target_section_owner () : m_v (nullptr) {} + target_section_owner (const bfd *bfd) : bfd (bfd) {} + target_section_owner (const objfile *objfile) : objfile (objfile) {} + target_section_owner (const shobj *shobj) : shobj (shobj) {} + + /* Use this to access the type-erased version of the owner, for + comparisons, printing, etc. We don't access the M_V member + directly, because pedantically it is not valid to access a + non-active union member. */ + const void *v () const + { + void *tmp; + memcpy (&tmp, this, sizeof (*this)); + return tmp; + } + + const struct bfd *bfd; + const struct objfile *objfile; + const struct shobj *shobj; + +private: + const void *m_v; +}; + /* Struct target_section maps address ranges to file sections. It is mostly used with BFD files, but can be used without (e.g. for handling raw disks, or files not in formats handled by BFD). */ @@ -27,7 +59,7 @@ struct target_section { target_section (CORE_ADDR addr_, CORE_ADDR end_, struct bfd_section *sect_, - void *owner_ = nullptr) + target_section_owner owner_ = {}) : addr (addr_), endaddr (end_), the_bfd_section (sect_), @@ -44,11 +76,11 @@ struct target_section struct bfd_section *the_bfd_section; /* The "owner" of the section. - It can be any unique value. It is set by add_target_sections - and used by remove_target_sections. + + It is set by add_target_sections and used by remove_target_sections. For example, for executables it is a pointer to exec_bfd and - for shlibs it is the so_list pointer. */ - const void *owner; + for shlibs it is the shobj pointer. */ + target_section_owner owner; }; #endif /* GDB_TARGET_SECTION_H */ |