diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rw-r--r-- | gdb/exec.c | 29 | ||||
| -rw-r--r-- | gdb/exec.h | 2 | ||||
| -rw-r--r-- | gdb/progspace.c | 20 | ||||
| -rw-r--r-- | gdb/progspace.h | 3 |
5 files changed, 35 insertions, 28 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 357c57f..d06ea47 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ 2020-10-29 Tom Tromey <tom@tromey.com> + * progspace.c (program_space::exec_close): New method, from + exec_close in exec.c. + * exec.c (exec_close): Move to progspace.c. + (exec_target::close, exec_file_attach): Update. + * progspace.h (struct program_space) <exec_close>: Declare + method. + +2020-10-29 Tom Tromey <tom@tromey.com> + * progspace.h (struct program_space) <exec_filename>: Rename from pspace_exec_filename. Now a unique_xmalloc_ptr. * inferior.c (print_selected_inferior): Update. @@ -148,29 +148,6 @@ exec_target_open (const char *args, int from_tty) exec_file_attach (args, from_tty); } -/* Close and clear exec_bfd. If we end up with no target sections to - read memory from, this unpushes the exec_ops target. */ - -void -exec_close (void) -{ - if (exec_bfd) - { - bfd *abfd = exec_bfd; - - gdb_bfd_unref (abfd); - - /* Removing target sections may close the exec_ops target. - Clear exec_bfd before doing so to prevent recursion. */ - exec_bfd = NULL; - exec_bfd_mtime = 0; - - remove_target_sections (&exec_bfd); - - current_program_space->exec_filename.reset (nullptr); - } -} - /* This is the target_close implementation. Clears all target sections and closes all executable bfds from all program spaces. */ @@ -183,7 +160,7 @@ exec_target::close () { set_current_program_space (ss); current_target_sections->clear (); - exec_close (); + ss->exec_close (); } } @@ -396,7 +373,7 @@ exec_file_attach (const char *filename, int from_tty) gdb_bfd_ref_ptr exec_bfd_holder = gdb_bfd_ref_ptr::new_reference (exec_bfd); /* Remove any previous exec file. */ - exec_close (); + current_program_space->exec_close (); /* Now open and digest the file the user requested, if any. */ @@ -497,7 +474,7 @@ exec_file_attach (const char *filename, int from_tty) { /* Make sure to close exec_bfd, or else "run" might try to use it. */ - exec_close (); + current_program_space->exec_close (); error (_("\"%ps\": not in executable format: %s"), styled_string (file_name_style.style (), scratch_pathname), gdb_bfd_errmsg (bfd_get_error (), matching).c_str ()); @@ -117,8 +117,6 @@ extern void add_target_sections_of_objfile (struct objfile *objfile); extern void print_section_info (target_section_table *table, bfd *abfd); -extern void exec_close (void); - /* Helper function that attempts to open the symbol file at EXEC_FILE_HOST. If successful, it proceeds to add the symbol file as the main symbol file. diff --git a/gdb/progspace.c b/gdb/progspace.c index 7600123..8a15c40 100644 --- a/gdb/progspace.c +++ b/gdb/progspace.c @@ -223,6 +223,26 @@ program_space::solibs () const return next_adapter<struct so_list> (this->so_list); } +/* See progspace.h. */ + +void +program_space::exec_close () +{ + if (ebfd) + { + gdb_bfd_unref (ebfd); + + /* Removing target sections may close the exec_ops target. + Clear exec_bfd before doing so to prevent recursion. */ + ebfd = NULL; + ebfd_mtime = 0; + + remove_target_sections (&ebfd); + + exec_filename.reset (nullptr); + } +} + /* Copies program space SRC to DEST. Copies the main executable file, and the main symbol file. Returns DEST. */ diff --git a/gdb/progspace.h b/gdb/progspace.h index 3acce50..6dcec9c 100644 --- a/gdb/progspace.h +++ b/gdb/progspace.h @@ -272,6 +272,9 @@ struct program_space for (so_list *so : pspace->solibs ()) { ... } */ next_adapter<struct so_list> solibs () const; + /* Close and clear exec_bfd. If we end up with no target sections + to read memory from, this unpushes the exec_ops target. */ + void exec_close (); /* Unique ID number. */ int num = 0; |