From d6b289409bc58646f2a8ca2744e78fbee349497e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 25 Jul 2012 15:47:09 +0000 Subject: [PATCH] * NEWS: Mention maint info bfds. * gdb_bfd.c (all_bfds): New global. (gdb_bfd_ref, gdb_bfd_unref): Update all_bfds. (print_one_bfd, maintenance_info_bfds, _initialize_gdb_bfd): New functions. gdb/doc * gdb.texinfo (Maintenance Commands): Document maint info bfds. --- gdb/ChangeLog | 8 +++++ gdb/NEWS | 5 ++++ gdb/doc/ChangeLog | 4 +++ gdb/doc/gdb.texinfo | 5 ++++ gdb/gdb_bfd.c | 73 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 95 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 43d24ac7494..b2ddbb283c5 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2012-07-25 Tom Tromey + + * NEWS: Mention maint info bfds. + * gdb_bfd.c (all_bfds): New global. + (gdb_bfd_ref, gdb_bfd_unref): Update all_bfds. + (print_one_bfd, maintenance_info_bfds, _initialize_gdb_bfd): + New functions. + 2012-07-25 Ralf Corsépius * configure.tgt: Add v850*-*-rtems*. diff --git a/gdb/NEWS b/gdb/NEWS index 3333810cffe..4da886cae3b 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -3,6 +3,11 @@ *** Changes since GDB 7.5 +* New commands (for set/show, see "New options" below) + +maint info bfds + List the BFDs known to GDB. + *** Changes in GDB 7.5 * GDB now supports x32 ABI. Visit diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index cbe96d26a8c..7b7a912c907 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,7 @@ +2012-07-25 Tom Tromey + + * gdb.texinfo (Maintenance Commands): Document maint info bfds. + 2012-07-20 Doug Evans * gdb.texinfo (Mode Options): Delete --use-deprecated-index-sections. diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 68ea817d1e2..facca8f369d 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -34536,6 +34536,11 @@ Shared library events. @end table +@kindex maint info bfds +@item maint info bfds +This prints information about each @code{bfd} object that is known to +@value{GDBN}. @xref{Top, , BFD, bfd, The Binary File Descriptor Library}. + @kindex set displaced-stepping @kindex show displaced-stepping @cindex displaced stepping support diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 1e6af492358..40e1c4dc3a6 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -22,6 +22,8 @@ #include "gdb_bfd.h" #include "gdb_assert.h" #include "gdb_string.h" +#include "ui-out.h" +#include "gdbcmd.h" #include "hashtab.h" #ifdef HAVE_ZLIB_H #include @@ -48,6 +50,13 @@ struct gdb_bfd_section_data void *map_addr; }; +/* A hash table holding every BFD that gdb knows about. This is not + to be confused with 'gdb_bfd_cache', which is used for sharing + BFDs; in contrast, this hash is used just to implement + "maint info bfd". */ + +static htab_t all_bfds; + /* See gdb_bfd.h. */ void @@ -224,6 +233,7 @@ void gdb_bfd_ref (struct bfd *abfd) { struct gdb_bfd_data *gdata; + void **slot; if (abfd == NULL) return; @@ -240,6 +250,11 @@ gdb_bfd_ref (struct bfd *abfd) gdata->refc = 1; gdata->mtime = bfd_get_mtime (abfd); bfd_usrdata (abfd) = gdata; + + /* This is the first we've seen it, so add it to the hash table. */ + slot = htab_find_slot (all_bfds, abfd, INSERT); + gdb_assert (slot && !*slot); + *slot = abfd; } /* See gdb_bfd.h. */ @@ -249,6 +264,7 @@ gdb_bfd_unref (struct bfd *abfd) { struct gdb_bfd_data *gdata; struct gdb_bfd_cache_search search; + void **slot; if (abfd == NULL) return; @@ -277,6 +293,8 @@ gdb_bfd_unref (struct bfd *abfd) bfd_usrdata (abfd) = NULL; /* Paranoia. */ + htab_remove_elt (all_bfds, abfd); + gdb_bfd_close_or_warn (abfd); } @@ -595,3 +613,58 @@ gdb_bfd_fdopenr (const char *filename, const char *target, int fd) return result; } + + + +/* A callback for htab_traverse that prints a single BFD. */ + +static int +print_one_bfd (void **slot, void *data) +{ + bfd *abfd = *slot; + struct gdb_bfd_data *gdata = bfd_usrdata (abfd); + struct ui_out *uiout = data; + struct cleanup *inner; + + inner = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); + ui_out_field_int (uiout, "refcount", gdata->refc); + ui_out_field_string (uiout, "addr", host_address_to_string (abfd)); + ui_out_field_string (uiout, "filename", bfd_get_filename (abfd)); + ui_out_text (uiout, "\n"); + do_cleanups (inner); + + return 1; +} + +/* Implement the 'maint info bfd' command. */ + +static void +maintenance_info_bfds (char *arg, int from_tty) +{ + struct cleanup *cleanup; + struct ui_out *uiout = current_uiout; + + cleanup = make_cleanup_ui_out_table_begin_end (uiout, 3, -1, "bfds"); + ui_out_table_header (uiout, 10, ui_left, "refcount", "Refcount"); + ui_out_table_header (uiout, 18, ui_left, "addr", "Address"); + ui_out_table_header (uiout, 40, ui_left, "filename", "Filename"); + + ui_out_table_body (uiout); + htab_traverse (all_bfds, print_one_bfd, uiout); + + do_cleanups (cleanup); +} + +/* -Wmissing-prototypes */ +extern initialize_file_ftype _initialize_gdb_bfd; + +void +_initialize_gdb_bfd (void) +{ + all_bfds = htab_create_alloc (10, htab_hash_pointer, htab_eq_pointer, + NULL, xcalloc, xfree); + + add_cmd ("bfds", class_maintenance, maintenance_info_bfds, _("\ +List the BFDs that are currently open."), + &maintenanceinfolist); +} -- 2.30.2