From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 04/13] [gdb/symtab] Add parent_map::dump
Date: Mon, 2 Oct 2023 14:50:42 +0200 [thread overview]
Message-ID: <20231002125051.29911-5-tdevries@suse.de> (raw)
In-Reply-To: <20231002125051.29911-1-tdevries@suse.de>
When dumping m_die_range_map using:
...
addrmap_dump (&m_die_range_map, gdb_stdlog, nullptr);
...
I get:
...
0x00000000000000d4 0x355e600
0x00000000000000de 0x355e630
0x00000000000000f5 0x355e600
0x0000000000000101 0x0
0x00000000000001c2 0x355e7b0
0x00000000000001cc 0x355e7e0
0x00000000000001e3 0x355e7b0
0x00000000000001ef 0x0
...
which doesn't make it clear which cooked_die_entries the values refer to.
Add a function parent_map::dump that passes an annotation function
to addrmap_dump such that we have instead:
...
0x00000000000000d4 0x360d300 (0xd3)
0x00000000000000de 0x360d330 (0xdd)
0x00000000000000f5 0x360d300 (0xd3)
0x0000000000000101 0x0
0x00000000000001c2 0x360d4b0 (0x1c1)
0x00000000000001cc 0x360d4e0 (0x1cb)
0x00000000000001e3 0x360d4b0 (0x1c1)
0x00000000000001ef 0x0
...
Tested on x86_64-linux.
---
gdb/addrmap.c | 19 +++++++++++++------
gdb/addrmap.h | 7 +++++--
gdb/dwarf2/cooked-index.h | 18 ++++++++++++++++++
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index d16775d49d4..4c58427903b 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -361,7 +361,9 @@ addrmap_mutable::~addrmap_mutable ()
/* See addrmap.h. */
void
-addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload)
+addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload,
+ void (*annotate_value)(struct ui_file *outfile,
+ const void *value))
{
/* True if the previously printed addrmap entry was for PAYLOAD.
If so, we want to print the next one as well (since the next
@@ -380,11 +382,16 @@ addrmap_dump (struct addrmap *map, struct ui_file *outfile, void *payload)
addr_str = "<ends here>";
if (matches || previous_matched)
- gdb_printf (outfile, " %s%s %s\n",
- payload != nullptr ? " " : "",
- core_addr_to_string (start_addr),
- addr_str);
-
+ {
+ gdb_printf (outfile, " %s%s %s",
+ payload != nullptr ? " " : "",
+ core_addr_to_string (start_addr),
+ addr_str);
+ /* Annotate value. */
+ if (annotate_value != nullptr)
+ annotate_value (outfile, obj);
+ gdb_printf (outfile, "\n");
+ }
previous_matched = matches;
return 0;
diff --git a/gdb/addrmap.h b/gdb/addrmap.h
index e00dda6e711..f67cd32df1d 100644
--- a/gdb/addrmap.h
+++ b/gdb/addrmap.h
@@ -205,8 +205,11 @@ struct addrmap_mutable : public addrmap
/* Dump the addrmap to OUTFILE. If PAYLOAD is non-NULL, only dump any
components that map to PAYLOAD. (If PAYLOAD is NULL, the entire
- map is dumped.) */
+ map is dumped.) If ANNOTATE_VALUE is non-nullptr, call it for each
+ value. */
void addrmap_dump (struct addrmap *map, struct ui_file *outfile,
- void *payload);
+ void *payload,
+ void (*annotate_value)(struct ui_file *outfile,
+ const void *value) = nullptr);
#endif /* ADDRMAP_H */
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index b51128d1f58..396c25b0718 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -266,6 +266,24 @@ class parent_map
gdb_assert (m_parent_map.find (end) == parent_entry);
}
+ /* Dump the parent map. */
+ void dump ()
+ {
+ auto annotate_cooked_index_entry
+ = [] (struct ui_file *outfile, const void *value)
+ {
+ const cooked_index_entry *parent_entry
+ = (const cooked_index_entry *)value;
+ if (parent_entry == nullptr)
+ return;
+ gdb_printf (outfile, " (0x%" PRIx64 ")",
+ to_underlying (parent_entry->die_offset));
+ };
+
+ addrmap_dump (&m_parent_map, gdb_stdlog, nullptr,
+ annotate_cooked_index_entry);
+ }
+
private:
/* An addrmap that maps from section offsets to cooked_index_entry *. */
addrmap_mutable m_parent_map;
--
2.35.3
next prev parent reply other threads:[~2023-10-02 12:50 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:50 [PATCH 00/13] [gdb/symtab, cc-with-dwz] Fix gdb.cp/breakpoint-locs.exp Tom de Vries
2023-10-02 12:50 ` [PATCH 01/13] [gdb/symtab] Factor out m_die_range_map usage Tom de Vries
2023-10-09 20:33 ` Alexandra Petlanova Hajkova
2023-10-09 21:43 ` Tom de Vries
2023-10-20 19:50 ` Tom Tromey
2023-11-30 12:55 ` Tom de Vries
2023-10-02 12:50 ` [PATCH 02/13] [gdb/symtab] Check effect in parent_map::set_parent Tom de Vries
2023-10-20 19:51 ` Tom Tromey
2023-11-30 14:05 ` Tom de Vries
2023-10-02 12:50 ` [PATCH 03/13] [gdb/symtab] Handle nullptr parent " Tom de Vries
2023-10-02 12:50 ` Tom de Vries [this message]
2023-10-10 9:05 ` [PATCH 04/13] [gdb/symtab] Add parent_map::dump Alexandra Petlanova Hajkova
2023-10-20 19:51 ` Tom Tromey
2023-10-02 12:50 ` [PATCH 05/13] [gdb/symtab] Factor out m_deferred_entries usage Tom de Vries
2023-10-02 12:50 ` [PATCH 06/13] [gdb/symtab] Add debug_handle_deferred_entries Tom de Vries
2023-10-02 12:50 ` [PATCH 07/13] [gdb/symtab] Resolve deferred entries, inter-shard case Tom de Vries
2023-10-20 20:11 ` Tom Tromey
2023-12-10 8:10 ` Tom de Vries
2023-10-02 12:50 ` [PATCH 08/13] [gdb/testsuite] Add gdb.dwarf2/forward-spec-inter-cu.exp Tom de Vries
2023-10-02 12:50 ` [PATCH 09/13] [gdb/symtab] Keep track of processed DIEs in shard Tom de Vries
2023-10-22 11:00 ` Alexandra Petlanova Hajkova
2023-12-08 12:09 ` Tom de Vries
2023-10-02 12:50 ` [PATCH 10/13] [gdb/symtab] Resolve deferred entries, intra-shard case Tom de Vries
2023-10-02 12:50 ` [PATCH 11/13] [gdb/symtab] Don't defer backward refs, inter-cu " Tom de Vries
2023-10-02 12:50 ` [PATCH 12/13] [gdb/testsuite] Add gdb.dwarf2/backward-spec-inter-cu.exp Tom de Vries
2023-10-02 12:50 ` [PATCH 13/13] [gdb/symtab] Add DW_TAG_inlined_subroutine entries in the cooked index for c++ Tom de Vries
2023-10-16 11:40 ` [PING][PATCH 00/13] [gdb/symtab, cc-with-dwz] Fix gdb.cp/breakpoint-locs.exp Tom de Vries
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231002125051.29911-5-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).