From: Mark Wielaard <mark@klomp.org>
To: dwz@sourceware.org
Cc: Mark Wielaard <mark@klomp.org>
Subject: [PATCH 1/4] Calculate size and write correct DWARF5 header
Date: Thu, 24 Sep 2020 18:25:54 +0200 [thread overview]
Message-ID: <20200924162557.15870-2-mark@klomp.org> (raw)
In-Reply-To: <20200924162557.15870-1-mark@klomp.org>
* dwz.c (try_debug_info): Add header size check for cu_version 5.
(read_debug_info): Likewise.
(partition_dups_1): Add 1 to pu_size for cu_version 5.
(create_import_tree): Include header_size, 13 or 14 depending on
cu_version, in cost comparision.
(compute_abbrevs): Adjust headersz depending on cu_version.
(recompute_abbrevs): Likewise.
(write_info): Write cu_version 5 unit type.
---
dwz.c | 45 ++++++++++++++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 7 deletions(-)
diff --git a/dwz.c b/dwz.c
index 180f9dc..8291333 100644
--- a/dwz.c
+++ b/dwz.c
@@ -5605,6 +5605,7 @@ try_debug_info (DSO *dso)
unsigned int culen;
int cu_version;
+ /* Note header is one bigger with DWARF version 5. */
if (ptr + (kind == DEBUG_TYPES ? 23 : 11) > endsec)
{
error (0, 0, "%s: %s CU header too small", dso->filename,
@@ -5682,6 +5683,13 @@ try_debug_info (DSO *dso)
if (cu_version == 5)
{
+ /* Above we only checked for the smaller version 4 header size. */
+ if (ptr + 4 > endsec)
+ {
+ error (0, 0, "%s: %s CU version 5 header too small",
+ dso->filename, debug_sections[kind].name);
+ goto fail;
+ }
value = read_32 (ptr);
if (value >= debug_sections[DEBUG_ABBREV].size)
{
@@ -5867,6 +5875,7 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
unsigned int debug_line_off;
unsigned int type_offset = 0;
+ /* Note header is one bigger with DWARF version 5. */
if (ptr + (kind == DEBUG_TYPES ? 23 : 11) > endsec)
{
error (0, 0, "%s: %s CU header too small", dso->filename,
@@ -5914,6 +5923,13 @@ read_debug_info (DSO *dso, int kind, unsigned int *die_count)
}
else
{
+ /* Above we only checked for the smaller version 4 header size. */
+ if (ptr + 4 > endsec)
+ {
+ error (0, 0, "%s: %s CU version 5 header too small",
+ dso->filename, debug_sections[kind].name);
+ goto fail;
+ }
value = read_32 (ptr);
if (value >= debug_sections[DEBUG_ABBREV].size)
{
@@ -7209,6 +7225,8 @@ partition_dups_1 (dw_die_ref *arr, size_t vec_size,
/* CU Header: address_size (ubyte).
1 byte. */
+ 1
+ /* DWARF5 CU header: unit_type (ubyte). */
+ + die_cu (arr[i])->cu_version >= 5 ? 1 : 0
/* CU Root DIE: abbreviation code (unsigned LEB128).
1 or more bytes. Optimistically assume 1. */
+ 1
@@ -8052,8 +8070,8 @@ create_import_tree (void)
that would need to be added, and if some new DW_TAG_partial_unit
CUs are going to be created as a result of this routine, that size
too. DW_TAG_imported_unit has size 5 (for DWARF3+) or 1 + ptr_size
- (DWARF2), DW_TAG_partial_unit has size 13 (11 CU header + 1 byte
- abbrev number + 1 byte child end). */
+ (DWARF2), DW_TAG_partial_unit has size 13/14 (11 CU header + 1 byte
+ abbrev number + 1 byte child end + 1 byte for DWARF5 unit_type). */
unsigned int size = 0;
/* Size of DW_TAG_imported_unit if the same everywhere, otherwise
(mixing DWARF2 and DWARF3+ with ptr_size != 4) 0. */
@@ -8306,14 +8324,18 @@ create_import_tree (void)
continue;
if (npu == NULL)
{
+ unsigned int header_size;
pusrc[srccount] = e3->icu;
+ header_size = (pusrc[srccount]->cu->cu_version >= 5
+ ? 14 : 13); /* DWARF5 unit_type byte. */
cost += edge_cost;
if (!edge_cost)
cost += pusrc[srccount]->cu->cu_version == 2
? 1 + ptr_size : 5;
srccount++;
if (ignore_size || ((dstcount - 1) * cost
- > 13 + dstcount * new_edge_cost))
+ > (header_size
+ + dstcount * new_edge_cost)))
{
unsigned int j;
@@ -10451,7 +10473,8 @@ compute_abbrevs (DSO *dso)
dw_die_ref *intracuarr, *intracuvec;
enum dwarf_form intracuform = DW_FORM_ref4;
dw_die_ref child, *lastotr, child_next, *last;
- unsigned int headersz = cu->cu_kind == CU_TYPES ? 23 : 11;
+ unsigned int headersz = (cu->cu_kind == CU_TYPES
+ ? 23 : (cu->cu_version >= 5 ? 12 : 11));
if (unlikely (fi_multifile) && cu->cu_die->die_remove)
continue;
@@ -10627,7 +10650,7 @@ compute_abbrevs (DSO *dso)
collapse_children (cu, cu->cu_die);
}
if (wr_multifile)
- total_size += 11;
+ total_size += 11; /* See the end of write_info. */
obstack_free (&ob2, (void *) t);
cuarr = (dw_cu_ref *) obstack_alloc (&ob2, ncus * sizeof (dw_cu_ref));
for (cu = first_cu, i = 0; cu; cu = cu->cu_next)
@@ -11721,7 +11744,8 @@ write_die (unsigned char *ptr, dw_cu_ref cu, dw_die_ref die,
static void
recompute_abbrevs (dw_cu_ref cu, unsigned int cu_size)
{
- unsigned int headersz = cu->cu_kind == CU_TYPES ? 23 : 11;
+ unsigned int headersz = (cu->cu_kind == CU_TYPES
+ ? 23 : (cu->cu_version >= 5 ? 12 : 11));
struct abbrev_tag *t;
unsigned int ndies = 0, intracusize, off, i;
dw_die_ref *intracuarr, *intracuvec;
@@ -11826,8 +11850,15 @@ write_info (unsigned int *die_count)
/* Write CU header. */
write_32 (ptr, next_off - cu->cu_new_offset - 4);
write_16 (ptr, cu->cu_version);
+ if (cu->cu_version >= 5)
+ {
+ *ptr++ = (cu->cu_die->die_tag == DW_TAG_compile_unit
+ ? DW_UT_compile : DW_UT_partial);
+ write_8 (ptr, ptr_size);
+ }
write_32 (ptr, cu->u2.cu_new_abbrev_offset);
- write_8 (ptr, ptr_size);
+ if (cu->cu_version < 5)
+ write_8 (ptr, ptr_size);
ptr = write_die (ptr, cu, cu->cu_die, NULL, NULL, die_count);
assert (info + (next_off - (wr_multifile ? multi_info_off : 0)) == ptr);
if (unlikely (low_mem) && cu->cu_kind != CU_PU)
--
2.18.4
next prev parent reply other threads:[~2020-09-24 16:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 16:25 Read and write DWARF5 units and forms Mark Wielaard
2020-09-24 16:25 ` Mark Wielaard [this message]
2020-09-24 19:39 ` [PATCH 1/4] Calculate size and write correct DWARF5 header Jakub Jelinek
2020-09-25 16:35 ` Mark Wielaard
2020-09-25 16:39 ` Jakub Jelinek
2020-09-24 16:25 ` [PATCH 2/4] Handle DW_FORM_data16 Mark Wielaard
2020-09-24 19:43 ` Jakub Jelinek
2020-09-24 21:53 ` Jakub Jelinek
2020-09-25 16:42 ` Mark Wielaard
2020-09-24 16:25 ` [PATCH 3/4] Handle DW_FORM_line_strp by not moving DIE Mark Wielaard
2020-09-24 19:45 ` Jakub Jelinek
2020-09-24 16:25 ` [PATCH 4/4] Handle DW_FORM_implicit_const [experiment] Mark Wielaard
2020-09-24 19:57 ` 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=20200924162557.15870-2-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).