espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-12-19 01:19:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb: add a new build_id_equal function

Browse Source 
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.

Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Andrew Burgess
2024-05-06 19:54:27 +01:00
parent e5b12a313f
commit cb1a6b85b8
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gdb/build-id.c
View File

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

26
gdb/build-id.h
View File

@@ -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 */

6
gdb/exec.c
View File

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