diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/exec.c | 2 | ||||
| -rw-r--r-- | gdb/gdb_bfd.c | 16 | ||||
| -rw-r--r-- | gdb/gdb_bfd.h | 25 | ||||
| -rw-r--r-- | gdb/symfile-mem.c | 2 |
5 files changed, 27 insertions, 28 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b65ec81e359..7da8ca3c2a8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2018-04-30 Tom Tromey <tom@tromey.com> + * symfile-mem.c (symbol_file_add_from_memory): Use new_reference. + * gdb_bfd.h (new_bfd_ref): Remove. + (gdb_bfd_open): Update comment. + * gdb_bfd.c (gdb_bfd_open, gdb_bfd_fopen, gdb_bfd_openr) + (gdb_bfd_openw, gdb_bfd_openr_iovec, gdb_bfd_record_inclusion) + (gdb_bfd_fdopenr): Use new_reference. + * exec.c (exec_file_attach): Use new_reference. + +2018-04-30 Tom Tromey <tom@tromey.com> + * common/gdb_ref_ptr.h (ref_ptr::new_reference): New static method. diff --git a/gdb/exec.c b/gdb/exec.c index f94c15f1f53..b529b7a0d3b 100644 --- a/gdb/exec.c +++ b/gdb/exec.c @@ -246,7 +246,7 @@ exec_file_attach (const char *filename, int from_tty) /* First, acquire a reference to the current exec_bfd. We release this at the end of the function; but acquiring it now lets the BFD cache return it if this call refers to the same file. */ - gdb_bfd_ref_ptr exec_bfd_holder = new_bfd_ref (exec_bfd); + gdb_bfd_ref_ptr exec_bfd_holder = gdb_bfd_ref_ptr::new_reference (exec_bfd); /* Remove any previous exec file. */ exec_close (); diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 02b1375b8ac..8fedeb438da 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -450,7 +450,7 @@ gdb_bfd_open (const char *name, const char *target, int fd) host_address_to_string (abfd), bfd_get_filename (abfd)); close (fd); - return new_bfd_ref (abfd); + return gdb_bfd_ref_ptr::new_reference (abfd); } abfd = bfd_fopen (name, target, FOPEN_RB, fd); @@ -470,7 +470,7 @@ gdb_bfd_open (const char *name, const char *target, int fd) *slot = abfd; } - return new_bfd_ref (abfd); + return gdb_bfd_ref_ptr::new_reference (abfd); } /* A helper function that releases any section data attached to the @@ -781,7 +781,7 @@ gdb_bfd_fopen (const char *filename, const char *target, const char *mode, { bfd *result = bfd_fopen (filename, target, mode, fd); - return new_bfd_ref (result); + return gdb_bfd_ref_ptr::new_reference (result); } /* See gdb_bfd.h. */ @@ -791,7 +791,7 @@ gdb_bfd_openr (const char *filename, const char *target) { bfd *result = bfd_openr (filename, target); - return new_bfd_ref (result); + return gdb_bfd_ref_ptr::new_reference (result); } /* See gdb_bfd.h. */ @@ -801,7 +801,7 @@ gdb_bfd_openw (const char *filename, const char *target) { bfd *result = bfd_openw (filename, target); - return new_bfd_ref (result); + return gdb_bfd_ref_ptr::new_reference (result); } /* See gdb_bfd.h. */ @@ -826,7 +826,7 @@ gdb_bfd_openr_iovec (const char *filename, const char *target, open_func, open_closure, pread_func, close_func, stat_func); - return new_bfd_ref (result); + return gdb_bfd_ref_ptr::new_reference (result); } /* See gdb_bfd.h. */ @@ -871,7 +871,7 @@ gdb_bfd_record_inclusion (bfd *includer, bfd *includee) struct gdb_bfd_data *gdata; gdata = (struct gdb_bfd_data *) bfd_usrdata (includer); - gdata->included_bfds.push_back (new_bfd_ref (includee)); + gdata->included_bfds.push_back (gdb_bfd_ref_ptr::new_reference (includee)); } /* See gdb_bfd.h. */ @@ -881,7 +881,7 @@ gdb_bfd_fdopenr (const char *filename, const char *target, int fd) { bfd *result = bfd_fdopenr (filename, target, fd); - return new_bfd_ref (result); + return gdb_bfd_ref_ptr::new_reference (result); } diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h index 2e4ac2c4093..85300b91f60 100644 --- a/gdb/gdb_bfd.h +++ b/gdb/gdb_bfd.h @@ -68,27 +68,16 @@ struct gdb_bfd_ref_policy /* A gdb::ref_ptr that has been specialized for BFD objects. */ typedef gdb::ref_ptr<struct bfd, gdb_bfd_ref_policy> gdb_bfd_ref_ptr; -/* A helper function that calls gdb_bfd_ref and returns a - gdb_bfd_ref_ptr. */ - -static inline gdb_bfd_ref_ptr -new_bfd_ref (struct bfd *abfd) -{ - gdb_bfd_ref (abfd); - return gdb_bfd_ref_ptr (abfd); -} - /* Open a read-only (FOPEN_RB) BFD given arguments like bfd_fopen. If NAME starts with TARGET_SYSROOT_PREFIX then the BFD will be opened using target fileio operations if necessary. Returns NULL - on error. On success, returns a new reference to the BFD, which - must be freed with gdb_bfd_unref. BFDs returned by this call are - shared among all callers opening the same file. If FD is not -1, - then after this call it is owned by BFD. If the BFD was not - accessed using target fileio operations then the filename - associated with the BFD and accessible with bfd_get_filename will - not be exactly NAME but rather NAME with TARGET_SYSROOT_PREFIX - stripped. */ + on error. On success, returns a new reference to the BFD. BFDs + returned by this call are shared among all callers opening the same + file. If FD is not -1, then after this call it is owned by BFD. + If the BFD was not accessed using target fileio operations then the + filename associated with the BFD and accessible with + bfd_get_filename will not be exactly NAME but rather NAME with + TARGET_SYSROOT_PREFIX stripped. */ gdb_bfd_ref_ptr gdb_bfd_open (const char *name, const char *target, int fd); diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c index c060711772d..2e82beb7a4e 100644 --- a/gdb/symfile-mem.c +++ b/gdb/symfile-mem.c @@ -99,7 +99,7 @@ symbol_file_add_from_memory (struct bfd *templ, CORE_ADDR addr, error (_("Failed to read a valid object file image from memory.")); /* Manage the new reference for the duration of this function. */ - gdb_bfd_ref_ptr nbfd_holder = new_bfd_ref (nbfd); + gdb_bfd_ref_ptr nbfd_holder = gdb_bfd_ref_ptr::new_reference (nbfd); xfree (bfd_get_filename (nbfd)); if (name == NULL) |