From: Nils-Christian Kempke <nils-christian.kempke@intel.com>
To: gdb-patches@sourceware.org
Cc: aburgess@redhat.com, jinisusan.george@amd.com, tom@tromey.com,
Nils-Christian Kempke <nils-christian.kempke@intel.com>
Subject: [PATCH v5 1/3] gdb, dwarf: move part of dwarf2_get_pc_bounds into separate function
Date: Mon, 8 Aug 2022 19:00:17 +0200 [thread overview]
Message-ID: <20220808170019.86052-2-nils-christian.kempke@intel.com> (raw)
In-Reply-To: <20220808170019.86052-1-nils-christian.kempke@intel.com>
This commit is in preparation of the next commit. There, we will add
a second variation to retrieve the pc bounds for DIEs tagged with
DW_TAG_entry_point. Instead of dwarf_get_pc_bounds_ranges_or_highlow_pc
we will call a separate method for entry points. As the validity checks
at the endo f dwarf2_get_pc_bounds are the same for both variants,
we introduced the new dwarf_get_pc_bounds_ranges_or_highlow_pc method,
outsourcing part of dwarf2_get_pc_bounds.
This commit should have no functional impact on GDB.
Signed-off-by: Nils-Christian Kempke <nils-christian.kempke@intel.com>
---
gdb/dwarf2/read.c | 71 +++++++++++++++++++++++++++++++++--------------
1 file changed, 50 insertions(+), 21 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 84faeb45238..569a7867084 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -13036,20 +13036,19 @@ dwarf2_ranges_read_low_addrs (unsigned offset, struct dwarf2_cu *cu,
});
}
-/* Get low and high pc attributes from a die. See enum pc_bounds_kind
- definition for the return value. *LOWPC and *HIGHPC are set iff
- neither PC_BOUNDS_NOT_PRESENT nor PC_BOUNDS_INVALID are returned. */
+/* Determine the low and high pc using the DW_AT_low_pc and DW_AT_high_pc or
+ DW_AT_ranges attributes of a DIE. */
-static enum pc_bounds_kind
-dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
- CORE_ADDR *highpc, struct dwarf2_cu *cu,
- addrmap *map, void *datum)
+static pc_bounds_kind
+dwarf_get_pc_bounds_ranges_or_highlow_pc (die_info *die, CORE_ADDR *low,
+ CORE_ADDR *high, dwarf2_cu *cu,
+ addrmap *map, void *datum)
{
- dwarf2_per_objfile *per_objfile = cu->per_objfile;
+ gdb_assert (low != nullptr);
+ gdb_assert (high != nullptr);
+
struct attribute *attr;
struct attribute *attr_high;
- CORE_ADDR low = 0;
- CORE_ADDR high = 0;
enum pc_bounds_kind ret;
attr_high = dwarf2_attr (die, DW_AT_high_pc, cu);
@@ -13058,17 +13057,19 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
attr = dwarf2_attr (die, DW_AT_low_pc, cu);
if (attr != nullptr)
{
- low = attr->as_address ();
- high = attr_high->as_address ();
+ *low = attr->as_address ();
+ *high = attr_high->as_address ();
if (cu->header.version >= 4 && attr_high->form_is_constant ())
- high += low;
+ *high += *low;
+
+ /* Found consecutive range of addresses. */
+ ret = PC_BOUNDS_HIGH_LOW;
}
else
- /* Found high w/o low attribute. */
- return PC_BOUNDS_INVALID;
-
- /* Found consecutive range of addresses. */
- ret = PC_BOUNDS_HIGH_LOW;
+ {
+ /* Found high w/o low attribute. */
+ ret = PC_BOUNDS_INVALID;
+ }
}
else
{
@@ -13086,16 +13087,44 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
/* Value of the DW_AT_ranges attribute is the offset in the
.debug_ranges section. */
- if (!dwarf2_ranges_read (ranges_offset, &low, &high, cu,
+ if (!dwarf2_ranges_read (ranges_offset, low, high, cu,
map, datum, die->tag))
return PC_BOUNDS_INVALID;
/* Found discontinuous range of addresses. */
ret = PC_BOUNDS_RANGES;
}
else
- return PC_BOUNDS_NOT_PRESENT;
+ {
+ /* Could not find high_pc or ranges attributed and thus no bounds
+ pair. */
+ ret = PC_BOUNDS_NOT_PRESENT;
+ }
}
+ return ret;
+}
+
+/* Get low and high pc attributes from a die. See enum pc_bounds_kind
+ definition for the return value. *LOWPC and *HIGHPC are set iff
+ neither PC_BOUNDS_NOT_PRESENT nor PC_BOUNDS_INVALID are returned. */
+
+static enum pc_bounds_kind
+dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
+ CORE_ADDR *highpc, struct dwarf2_cu *cu,
+ addrmap *map, void *datum)
+{
+ dwarf2_per_objfile *per_objfile = cu->per_objfile;
+
+ CORE_ADDR low = 0;
+ CORE_ADDR high = 0;
+ enum pc_bounds_kind ret;
+
+ ret = dwarf_get_pc_bounds_ranges_or_highlow_pc (die, &low, &high, cu, map,
+ datum);
+
+ if (ret == PC_BOUNDS_NOT_PRESENT || ret == PC_BOUNDS_INVALID)
+ return ret;
+
/* partial_die_info::read has also the strict LOW < HIGH requirement. */
if (high <= low)
return PC_BOUNDS_INVALID;
@@ -13112,7 +13141,7 @@ dwarf2_get_pc_bounds (struct die_info *die, CORE_ADDR *lowpc,
return PC_BOUNDS_INVALID;
*lowpc = low;
- if (highpc)
+ if (highpc != nullptr)
*highpc = high;
return ret;
}
--
2.25.1
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
next prev parent reply other threads:[~2022-08-08 17:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-08 17:00 [PATCH v5 0/3] Fortran entry and DW_TAG_entry_point Nils-Christian Kempke
2022-08-08 17:00 ` Nils-Christian Kempke [this message]
2022-08-23 14:40 ` [PING][PATCH " Kempke, Nils-Christian
2022-08-30 14:45 ` [PING 2][PATCH " Kempke, Nils-Christian
2022-08-30 14:45 ` Kempke, Nils-Christian
2022-09-19 10:21 ` [PING 3][PATCH " Kempke, Nils-Christian
2022-09-19 10:21 ` Kempke, Nils-Christian
2022-09-26 14:03 ` [PING 4][PATCH " Kempke, Nils-Christian
2022-09-26 14:03 ` Kempke, Nils-Christian
2022-10-05 20:24 ` [PING 5][PATCH " Kempke, Nils-Christian
2022-10-05 20:24 ` Kempke, Nils-Christian
2022-10-13 8:53 ` [PING 6][PATCH " Kempke, Nils-Christian
2022-10-13 8:53 ` Kempke, Nils-Christian
2022-10-21 8:15 ` [PING 7][PATCH " Kempke, Nils-Christian
2022-10-21 8:15 ` Kempke, Nils-Christian
2023-01-09 20:26 ` [PATCH " Tom Tromey
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=20220808170019.86052-2-nils-christian.kempke@intel.com \
--to=nils-christian.kempke@intel.com \
--cc=aburgess@redhat.com \
--cc=gdb-patches@sourceware.org \
--cc=jinisusan.george@amd.com \
--cc=tom@tromey.com \
/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).