From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Douglas RAILLARD <douglas.raillard@arm.com>
Cc: acme@redhat.com, dwarves@vger.kernel.org
Subject: Re: [PATCH v3 2/6] btf_loader.c: Refactor class__fixup_btf_bitfields
Date: Thu, 28 Oct 2021 10:15:50 -0300 [thread overview]
Message-ID: <YXqihsuph69fRGA6@kernel.org> (raw)
In-Reply-To: <20211028122710.881181-3-douglas.raillard@arm.com>
Em Thu, Oct 28, 2021 at 01:27:06PM +0100, Douglas RAILLARD escreveu:
> From: Douglas Raillard <douglas.raillard@arm.com>
>
> Refactor class__fixup_btf_bitfields to remove a "continue" statement, to
> prepare the ground for alignment fixup that is relevant for some types
> matching:
>
> type->tag != DW_TAG_base_type && type->tag != DW_TAG_enumeration_type
Also already applied.
- Arnaldo
> Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
> ---
> btf_loader.c | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
> diff --git a/btf_loader.c b/btf_loader.c
> index 3e5a945..9c2daee 100644
> --- a/btf_loader.c
> +++ b/btf_loader.c
> @@ -486,28 +486,27 @@ static int class__fixup_btf_bitfields(struct tag *tag, struct cu *cu)
> pos->byte_size = tag__size(type, cu);
> pos->bit_size = pos->byte_size * 8;
>
> - /* bitfield fixup is needed for enums and base types only */
> - if (type->tag != DW_TAG_base_type && type->tag != DW_TAG_enumeration_type)
> - continue;
> -
> /* if BTF data is incorrect and has size == 0, skip field,
> * instead of crashing */
> if (pos->byte_size == 0) {
> continue;
> }
>
> - if (pos->bitfield_size) {
> - /* bitfields seem to be always aligned, no matter the packing */
> - pos->byte_offset = pos->bit_offset / pos->bit_size * pos->bit_size / 8;
> - pos->bitfield_offset = pos->bit_offset - pos->byte_offset * 8;
> - /* re-adjust bitfield offset if it is negative */
> - if (pos->bitfield_offset < 0) {
> - pos->bitfield_offset += pos->bit_size;
> - pos->byte_offset -= pos->byte_size;
> - pos->bit_offset = pos->byte_offset * 8 + pos->bitfield_offset;
> + /* bitfield fixup is needed for enums and base types only */
> + if (type->tag == DW_TAG_base_type || type->tag == DW_TAG_enumeration_type) {
> + if (pos->bitfield_size) {
> + /* bitfields seem to be always aligned, no matter the packing */
> + pos->byte_offset = pos->bit_offset / pos->bit_size * pos->bit_size / 8;
> + pos->bitfield_offset = pos->bit_offset - pos->byte_offset * 8;
> + /* re-adjust bitfield offset if it is negative */
> + if (pos->bitfield_offset < 0) {
> + pos->bitfield_offset += pos->bit_size;
> + pos->byte_offset -= pos->byte_size;
> + pos->bit_offset = pos->byte_offset * 8 + pos->bitfield_offset;
> + }
> + } else {
> + pos->byte_offset = pos->bit_offset / 8;
> }
> - } else {
> - pos->byte_offset = pos->bit_offset / 8;
> }
> }
>
> --
> 2.25.1
--
- Arnaldo
next prev parent reply other threads:[~2021-10-28 13:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-28 12:27 [PATCH v3 0/6] Infer BTF alignment Douglas RAILLARD
2021-10-28 12:27 ` [PATCH v3 1/6] fprintf: Fix nested struct printing Douglas RAILLARD
2021-10-28 12:40 ` Arnaldo Carvalho de Melo
2021-10-28 12:27 ` [PATCH v3 2/6] btf_loader.c: Refactor class__fixup_btf_bitfields Douglas RAILLARD
2021-10-28 13:15 ` Arnaldo Carvalho de Melo [this message]
2021-10-28 12:27 ` [PATCH v3 3/6] btf_loader.c: Infer alignment info Douglas RAILLARD
2021-10-28 13:15 ` Arnaldo Carvalho de Melo
2021-10-28 12:27 ` [PATCH v3 4/6] dwarves_fprintf: Move cacheline_size into struct conf_fprintf Douglas RAILLARD
2021-10-28 13:18 ` Arnaldo Carvalho de Melo
2021-10-28 12:27 ` [PATCH v3 5/6] btf_loader.c: Propagate struct conf_load Douglas RAILLARD
2021-10-28 13:19 ` Arnaldo Carvalho de Melo
2021-10-28 12:27 ` [PATCH v3 6/6] btf_loader.c: Use cacheline size to infer alignment Douglas RAILLARD
2021-10-28 13:24 ` Arnaldo Carvalho de Melo
2021-10-28 14:12 ` Douglas Raillard
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=YXqihsuph69fRGA6@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=douglas.raillard@arm.com \
--cc=dwarves@vger.kernel.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 NNTP newsgroup(s).