From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Subject: Re: [PATCH] gdb: add a new build_id_equal function
Date: Wed, 08 May 2024 17:57:13 +0100 [thread overview]
Message-ID: <87msp0s0ly.fsf@redhat.com> (raw)
In-Reply-To: <0190950f81b11351a1b2185b69d632573afac396.1715182023.git.aburgess@redhat.com>
Andrew Burgess <aburgess@redhat.com> writes:
> Add two versions of a new function build_id_equal which can be used to
> compare build-ids, then make use of these functions in GDB. It seems
> better to have a specific function for the task of comparing build-ids
> rather than having a length check followed by a memcmp call.
>
> There should be no user visible changes after this commit.
The initial version of this patch conflicts with the filename styling
patch that I just pushed to master.
Here's an updated version of the build-id patch, no real changes, just
resolved the merge conflict.
Thanks,
Andrew
---
commit 52a37959dfc8633d47e5aa18458d3bbf3dd53fb9
Author: Andrew Burgess <aburgess@redhat.com>
Date: Mon May 6 19:54:27 2024 +0100
gdb: add a new build_id_equal function
Add two versions of a new function build_id_equal which can be used to
compare build-ids, then make use of these functions in GDB. It seems
better to have a specific function for the task of comparing build-ids
rather than having a length check followed by a memcmp call.
There should be no user visible changes after this commit.
diff --git a/gdb/build-id.c b/gdb/build-id.c
index 659801b0865..41667d5e5cf 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -63,8 +63,7 @@ build_id_verify (bfd *abfd, size_t check_len, const bfd_byte *check)
warning (_("File \"%ps\" has no build-id, file skipped"),
styled_string (file_name_style.style (),
bfd_get_filename (abfd)));
- else if (found->size != check_len
- || memcmp (found->data, check, found->size) != 0)
+ else if (!build_id_equal (found, check_len, check))
warning (_("File \"%ps\" has a different build-id, file skipped"),
styled_string (file_name_style.style (),
bfd_get_filename (abfd)));
diff --git a/gdb/build-id.h b/gdb/build-id.h
index 15bd8a964dc..c5f20f8782e 100644
--- a/gdb/build-id.h
+++ b/gdb/build-id.h
@@ -70,4 +70,30 @@ build_id_to_string (const bfd_build_id *build_id)
return bin2hex (build_id->data, build_id->size);
}
+/* Compare the content of two build-ids. One build-id (A) is passed as a
+ build-id pointer, while the second is passed using BUILD_ID_LEN and
+ BUILD_ID_DATA. Return true if the build-ids match, otherwise false. */
+
+static inline bool
+build_id_equal (const bfd_build_id *a, const bfd_size_type build_id_len,
+ const bfd_byte *build_id_data)
+{
+ gdb_assert (a != nullptr);
+ gdb_assert (build_id_data != nullptr);
+
+ return (a->size == build_id_len
+ && memcmp (a->data, build_id_data, a->size) == 0);
+}
+
+/* Like the above, but take two build-id pointers A and B. */
+
+static inline bool
+build_id_equal (const bfd_build_id *a, const bfd_build_id *b)
+{
+ gdb_assert (a != nullptr);
+ gdb_assert (b != nullptr);
+
+ return build_id_equal (a, b->size, b->data);
+}
+
#endif /* BUILD_ID_H */
diff --git a/gdb/exec.c b/gdb/exec.c
index 3d392b198a1..88915260d60 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -253,10 +253,8 @@ validate_exec_file (int from_tty)
if (target_exec_file_build_id != nullptr)
{
- if (exec_file_build_id->size == target_exec_file_build_id->size
- && memcmp (exec_file_build_id->data,
- target_exec_file_build_id->data,
- exec_file_build_id->size) == 0)
+ if (build_id_equal (exec_file_build_id,
+ target_exec_file_build_id))
{
/* Match. */
return;
next prev parent reply other threads:[~2024-05-08 16:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 15:27 Andrew Burgess
2024-05-08 16:57 ` Andrew Burgess [this message]
2024-05-08 17:07 ` Tom Tromey
2024-05-09 9:11 ` Andrew Burgess
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=87msp0s0ly.fsf@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@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).