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

Speed up objcopy's note merging.

Browse Source 
PR 29993
  * objcopy.c (merge_gnu_build_notes): Remember the last non-deleted note in order to speed up the scan for matching notes.
This commit is contained in:
Nick Clifton
2023-01-18 11:32:21 +00:00
parent 1b1be68b9b
commit 94e76498c3
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@ -1,3 +1,9 @@
2023-01-18 Nick Clifton <nickc@redhat.com>
PR 29993
* objcopy.c (merge_gnu_build_notes): Remember the last non-deleted
note in order to speed up the scan for matching notes.
2023-01-16 Nick Clifton <nickc@redhat.com> 2023-01-16 Nick Clifton <nickc@redhat.com>
* po/sv.po: Updated Swedish translation. * po/sv.po: Updated Swedish translation.

24
binutils/objcopy.c
View File

@ -2035,19 +2035,19 @@ contained_by (objcopy_internal_note * needle,
return needle->start >= haystack->start && needle->end <= haystack->end; return needle->start >= haystack->start && needle->end <= haystack->end;
} }
static bool static inline bool
is_open_note (objcopy_internal_note * pnote) is_open_note (objcopy_internal_note * pnote)
{ {
return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_OPEN; return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_OPEN;
} }
static bool static inline bool
is_func_note (objcopy_internal_note * pnote) is_func_note (objcopy_internal_note * pnote)
{ {
return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_FUNC; return pnote->note.type == NT_GNU_BUILD_ATTRIBUTE_FUNC;
} }
static bool static inline bool
is_deleted_note (objcopy_internal_note * pnote) is_deleted_note (objcopy_internal_note * pnote)
{ {
return pnote->note.type == 0; return pnote->note.type == 0;
@ -2403,6 +2403,8 @@ merge_gnu_build_notes (bfd * abfd,
other note then if they are both of the same type (open other note then if they are both of the same type (open
or func) then they can be merged and one deleted. If or func) then they can be merged and one deleted. If
they are of different types then they cannot be merged. */ they are of different types then they cannot be merged. */
objcopy_internal_note * prev_note = NULL;
for (pnote = pnotes; pnote < pnotes_end; pnote ++) for (pnote = pnotes; pnote < pnotes_end; pnote ++)
{ {
/* Skip already deleted notes. /* Skip already deleted notes.
@ -2424,7 +2426,9 @@ merge_gnu_build_notes (bfd * abfd,
objcopy_internal_note * back; objcopy_internal_note * back;
/* Rule 2: Check to see if there is an identical previous note. */ /* Rule 2: Check to see if there is an identical previous note. */
for (iter = 0, back = pnote - 1; back >= pnotes; back --) for (iter = 0, back = prev_note ? prev_note : pnote - 1;
back >= pnotes;
back --)
{ {
if (is_deleted_note (back)) if (is_deleted_note (back))
continue; continue;
@ -2486,11 +2490,17 @@ merge_gnu_build_notes (bfd * abfd,
break; break;
} }
} }
#if DEBUG_MERGE
if (! is_deleted_note (pnote)) if (! is_deleted_note (pnote))
merge_debug ("Unable to do anything with note at %#08lx\n", {
(pnote->note.namedata - (char *) contents) - 12); /* Keep a pointer to this note, so that we can
start the next search for rule 2 matches here. */
prev_note = pnote;
#if DEBUG_MERGE
merge_debug ("Unable to do anything with note at %#08lx\n",
(pnote->note.namedata - (char *) contents) - 12);
#endif #endif
}
} }
/* Resort the notes. */ /* Resort the notes. */