diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/exec.c | 16 | ||||
| -rw-r--r-- | gdb/exec.h | 6 | ||||
| -rw-r--r-- | gdb/progspace.h | 5 | ||||
| -rw-r--r-- | gdb/solib.c | 2 |
5 files changed, 22 insertions, 16 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ce9c193..3aeb0d1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2020-10-29 Tom Tromey <tom@tromey.com> + * solib.c (solib_map_sections): Update. + * exec.c (program_space::add_target_sections): Now a method. + (exec_file_attach): Update. + * exec.h (add_target_sections): Don't declare. + * progspace.h (struct program_space) <add_target_sections>: + Declare. + +2020-10-29 Tom Tromey <tom@tromey.com> + * progspace.h (struct program_space) <remove_target_sections>: Declare. * exec.c (program_space::remove_target_sections): Now a method. @@ -497,7 +497,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. */ - add_target_sections (¤t_program_space->ebfd, sections); + current_program_space->add_target_sections (¤t_program_space->ebfd, + sections); /* Tell display code (if any) about the changed file name. */ if (deprecated_exec_file_display_hook) @@ -594,28 +595,25 @@ build_section_table (struct bfd *some_bfd) current set of target sections. */ void -add_target_sections (void *owner, - const target_section_table §ions) +program_space::add_target_sections (void *owner, + const target_section_table §ions) { - target_section_table *table = ¤t_program_space->target_sections; - if (!sections.empty ()) { for (const target_section &s : sections) { - table->push_back (s); - table->back ().owner = owner; + target_sections.push_back (s); + target_sections.back ().owner = owner; } scoped_restore_current_pspace_and_thread restore_pspace_thread; - program_space *curr_pspace = current_program_space; /* If these are the first file sections we can provide memory from, push the file_stratum target. Must do this in all inferiors sharing the program space. */ for (inferior *inf : all_inferiors ()) { - if (inf->pspace != curr_pspace) + if (inf->pspace != this) continue; if (inf->target_is_pushed (&exec_ops)) @@ -92,12 +92,6 @@ extern enum target_xfer_status /* Set the loaded address of a section. */ extern void exec_set_section_address (const char *, int, CORE_ADDR); -/* Add the sections array defined by [SECTIONS..SECTIONS_END[ to the - current set of target sections. */ - -extern void add_target_sections (void *owner, - const target_section_table §ions); - /* Add the sections of OBJFILE to the current set of target sections. * OBJFILE owns the new target sections. */ diff --git a/gdb/progspace.h b/gdb/progspace.h index f4e1107..92a7942 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -300,6 +300,11 @@ struct program_space /* Remove all target sections owned by OWNER. */ void remove_target_sections (void *owner); + /* Add the sections array defined by SECTIONS to the + current set of target sections. */ + void add_target_sections (void *owner, + const target_section_table §ions); + /* Unique ID number. */ int num = 0; diff --git a/gdb/solib.c b/gdb/solib.c index 64b2035..e7dbde6 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -578,7 +578,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); + current_program_space->add_target_sections (so, *so->sections); return 1; } |