From: Mark Wielaard <mark@klomp.org>
To: dwz@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH 2/4] Handle DWARF5 headers for compile and partial units.
Date: Mon, 14 Sep 2020 12:23:53 +0200 [thread overview]
Message-ID: <20200914102355.8137-3-mark@klomp.org> (raw)
In-Reply-To: <20200914102355.8137-1-mark@klomp.org>
DWARF5 also has separate unit headers for types (replacing .debug_types)
and unit types for split-DWARF both a skeleton tree as compile and split
trees. Which aren't handled yet.
* dwz.c (get_DW_UT_str): New function.
(read_debug_line): Add .debug_line in version message error string.
(try_debug_info): Parse cu_version 5 header for DW_UT_compile and
DW_UT_partial. Add explicit error message for failing to read
abbrev.
(read_debug_info): Likewise.
---
dwz.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 file changed, 120 insertions(+), 26 deletions(-)
diff --git a/dwz.c b/dwz.c
index 6a4c96c..5d4b004 100644
--- a/dwz.c
+++ b/dwz.c
@@ -670,6 +670,28 @@ get_DW_AT_str (unsigned int at)
return buf;
}
+/* Retrun a DW_UT_* name. */
+static const char *
+get_DW_UT_str (unsigned int ut)
+{
+ const char *name;
+ static char buf[7 + 3 * sizeof (int)];
+ switch (ut)
+ {
+ case DW_UT_compile: name = "DW_UT_compile"; break;
+ case DW_UT_type: name = "DW_UT_type"; break;
+ case DW_UT_partial: name = "DW_UT_partial"; break;
+ case DW_UT_skeleton: name = "DW_UT_partial"; break;
+ case DW_UT_split_compile: name = "DW_UT_split_compile"; break;
+ case DW_UT_split_type: name = "DW_UT_split_type"; break;
+ default: name = 0; break;
+ }
+ if (name)
+ return name;
+ sprintf (buf, "DW_UT_%u", ut);
+ return buf;
+}
+
/* This must match the debug_sections array content
below. */
enum debug_section_kind
@@ -1332,8 +1354,8 @@ read_debug_line (DSO *dso, dw_cu_ref cu, uint32_t off)
value = read_16 (ptr);
if (value < 2 || value > 4)
{
- error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- value);
+ error (0, 0, "%s: DWARF version %d in .debug_line unhandled",
+ dso->filename, value);
return 1;
}
@@ -5572,24 +5594,41 @@ try_debug_info (DSO *dso)
}
cu_version = read_16 (ptr);
- if (cu_version < 2 || cu_version > 4)
+ if (kind == DEBUG_TYPES &&
+ (cu_version < 2 || cu_version > 4))
{
- error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- cu_version);
+ error (0, 0, "%s: DWARF version %d in .debug_types unhandled",
+ dso->filename, cu_version);
goto fail;
}
-
- value = read_32 (ptr);
- if (value >= debug_sections[DEBUG_ABBREV].size)
+ else if (cu_version < 2 || cu_version > 5)
{
- if (debug_sections[DEBUG_ABBREV].data == NULL)
- error (0, 0, "%s: .debug_abbrev not present", dso->filename);
- else
- error (0, 0, "%s: DWARF CU abbrev offset too large",
- dso->filename);
+ error (0, 0, "%s: DWARF version %d in .debug_info unhandled",
+ dso->filename, cu_version);
goto fail;
}
+ if (cu_version == 5)
+ {
+ value = read_8 (ptr);
+ if (value != DW_UT_compile && value != DW_UT_partial)
+ error (0, 0, "%s: DWARF CU type %s unhandled", dso->filename,
+ get_DW_UT_str (value));
+ }
+ else
+ {
+ value = read_32 (ptr);
+ if (value >= debug_sections[DEBUG_ABBREV].size)
+ {
+ if (debug_sections[DEBUG_ABBREV].data == NULL)
+ error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ else
+ error (0, 0, "%s: DWARF CU abbrev offset too large",
+ dso->filename);
+ goto fail;
+ }
+ }
+
if (ptr_size == 0)
{
ptr_size = read_8 (ptr);
@@ -5607,6 +5646,20 @@ try_debug_info (DSO *dso)
goto fail;
}
+ if (cu_version == 5)
+ {
+ value = read_32 (ptr);
+ if (value >= debug_sections[DEBUG_ABBREV].size)
+ {
+ if (debug_sections[DEBUG_ABBREV].data == NULL)
+ error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ else
+ error (0, 0, "%s: DWARF CU abbrev offset too large",
+ dso->filename);
+ goto fail;
+ }
+ }
+
if (abbrev == NULL || value != last_abbrev_offset)
{
if (abbrev)
@@ -5614,7 +5667,11 @@ try_debug_info (DSO *dso)
abbrev
= read_abbrev (dso, debug_sections[DEBUG_ABBREV].data + value);
if (abbrev == NULL)
- goto fail;
+ {
+ error (0, 0, "%s: Couldn't read abbrev at offset 0x%x",
+ dso->filename, value);
+ goto fail;
+ }
}
last_abbrev_offset = value;
@@ -5800,24 +5857,42 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
}
cu_version = read_16 (ptr);
- if (cu_version < 2 || cu_version > 4)
+ if (kind == DEBUG_TYPES &&
+ (cu_version < 2 || cu_version > 4))
{
- error (0, 0, "%s: DWARF version %d unhandled", dso->filename,
- cu_version);
+ error (0, 0, "%s: DWARF version %d in .debug_types unhandled",
+ dso->filename, cu_version);
goto fail;
}
-
- value = read_32 (ptr);
- if (value >= debug_sections[DEBUG_ABBREV].size)
+ else if (cu_version < 2 || cu_version > 5)
{
- if (debug_sections[DEBUG_ABBREV].data == NULL)
- error (0, 0, "%s: .debug_abbrev not present", dso->filename);
- else
- error (0, 0, "%s: DWARF CU abbrev offset too large",
- dso->filename);
+ error (0, 0, "%s: DWARF version %d in .debug_info unhandled",
+ dso->filename, cu_version);
goto fail;
}
+ if (cu_version == 5)
+ {
+ value = read_8 (ptr);
+ if (value != DW_UT_compile && value != DW_UT_partial)
+ error (0, 0, "%s: DWARF CU type %s unhandled", dso->filename,
+ get_DW_UT_str (value));
+
+ }
+ else
+ {
+ value = read_32 (ptr);
+ if (value >= debug_sections[DEBUG_ABBREV].size)
+ {
+ if (debug_sections[DEBUG_ABBREV].data == NULL)
+ error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ else
+ error (0, 0, "%s: DWARF CU abbrev offset too large",
+ dso->filename);
+ goto fail;
+ }
+ }
+
if (ptr_size == 0)
{
ptr_size = read_8 (ptr);
@@ -5835,6 +5910,20 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
goto fail;
}
+ if (cu_version == 5)
+ {
+ value = read_32 (ptr);
+ if (value >= debug_sections[DEBUG_ABBREV].size)
+ {
+ if (debug_sections[DEBUG_ABBREV].data == NULL)
+ error (0, 0, "%s: .debug_abbrev not present", dso->filename);
+ else
+ error (0, 0, "%s: DWARF CU abbrev offset too large",
+ dso->filename);
+ goto fail;
+ }
+ }
+
if (unlikely (op_multifile))
{
if (ptr == endcu)
@@ -5914,7 +6003,12 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
abbrev
= read_abbrev (dso, debug_sections[DEBUG_ABBREV].data + value);
if (abbrev == NULL)
- goto fail;
+ {
+ error (0, 0, "%s: Couldn't read abbrev at offset 0x%x",
+ dso->filename, value);
+
+ goto fail;
+ }
}
last_abbrev_offset = value;
--
2.18.4
next prev parent reply other threads:[~2020-09-14 10:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-14 10:23 DWARF5 support for dwz Mark Wielaard
2020-09-14 10:23 ` [PATCH 1/4] Recognize some new DWARF5 .debug sections Mark Wielaard
2020-09-14 10:36 ` Jakub Jelinek
2020-09-14 10:23 ` Mark Wielaard [this message]
2020-09-14 10:38 ` [PATCH 2/4] Handle DWARF5 headers for compile and partial units Jakub Jelinek
2020-09-15 11:38 ` Mark Wielaard
2020-09-14 10:23 ` [PATCH 3/4] Handle new DWARF5 attributes Mark Wielaard
2020-09-14 10:38 ` Jakub Jelinek
2020-09-14 10:23 ` [PATCH 4/4] Handle new DWARF5 operations as their GNU extension variants Mark Wielaard
2020-09-14 10:39 ` Jakub Jelinek
2020-09-14 10:48 ` DWARF5 support for dwz Jakub Jelinek
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=20200914102355.8137-3-mark@klomp.org \
--to=mark@klomp.org \
--cc=dwz@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).