public inbox for dwz@sourceware.org
 help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@redhat.com>
To: Mark Wielaard <mark@klomp.org>
Cc: dwz@sourceware.org
Subject: Re: [PATCH 1/4] Calculate size and write correct DWARF5 header
Date: Thu, 24 Sep 2020 21:39:35 +0200	[thread overview]
Message-ID: <20200924193935.GO2176@tucnak> (raw)
In-Reply-To: <20200924162557.15870-2-mark@klomp.org>

On Thu, Sep 24, 2020 at 06:25:54PM +0200, Mark Wielaard wrote:
> @@ -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

The above looks incorrect.
4 + 2 + 4 + 1 + x >= 5 ? 1 : 0 + 1 + 4 + 4
is (11 + x >= 5) ? 1 : (0 + 1 + 4 + 4)
rather than
4 + 2 + 4 + 1 + (x >= 5 ? 1 : 0) + 1 + 4 + 4
we need there.  So, please add ()s around.

> @@ -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));

Is the DWARF 5 .debug_info types header also 23 bytes long?

	Jakub


  reply	other threads:[~2020-09-24 19:39 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 ` [PATCH 1/4] Calculate size and write correct DWARF5 header Mark Wielaard
2020-09-24 19:39   ` Jakub Jelinek [this message]
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=20200924193935.GO2176@tucnak \
    --to=jakub@redhat.com \
    --cc=dwz@sourceware.org \
    --cc=mark@klomp.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).