diff options
| author | Alan Modra <amodra@gmail.com> | 2022-12-18 13:04:13 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2022-12-18 19:11:32 +1030 |
| commit | 20d8836e4ac6e416fda53152d453328934a2ea46 (patch) | |
| tree | a2f1521f30f38d98b36cb59b3feb581ee2e3252e /bfd | |
| parent | 3bbdb440d0eb9333c969e87d75996011bcdc9aff (diff) | |
| download | fsf-binutils-gdb-20d8836e4ac6e416fda53152d453328934a2ea46.zip fsf-binutils-gdb-20d8836e4ac6e416fda53152d453328934a2ea46.tar.gz fsf-binutils-gdb-20d8836e4ac6e416fda53152d453328934a2ea46.tar.bz2 | |
Comment bfd_get_section_limit_octets and bfd_get_section_alloc_size
* bfd.c (bfd_get_section_limit_octets): Add comment.
(bfd_get_section_alloc_size): Likewise.
* libbfd.c (_bfd_generic_get_section_contents): Use
bfd_get_section_limit_octets.
* section.c (bfd_get_section_contents): Likewise.
* bfd-in2.h: Regenerate.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/bfd-in2.h | 5 | ||||
| -rw-r--r-- | bfd/bfd.c | 5 | ||||
| -rw-r--r-- | bfd/libbfd.c | 10 | ||||
| -rw-r--r-- | bfd/section.c | 5 |
4 files changed, 12 insertions, 13 deletions
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index f4d531f..053eccf 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -6946,6 +6946,8 @@ bfd_set_asymbol_name (asymbol *sy, const char *name) sy->name = name; } +/* For input sections return the original size on disk of the + section. For output sections return the current size. */ static inline bfd_size_type bfd_get_section_limit_octets (const bfd *abfd, const asection *sec) { @@ -6962,6 +6964,9 @@ bfd_get_section_limit (const bfd *abfd, const asection *sec) / bfd_octets_per_byte (abfd, sec)); } +/* For input sections return the larger of the current size and the + original size on disk of the section. For output sections return + the current size. */ static inline bfd_size_type bfd_get_section_alloc_size (const bfd *abfd, const asection *sec) { @@ -502,6 +502,8 @@ CODE_FRAGMENT . sy->name = name; .} . +.{* For input sections return the original size on disk of the +. section. For output sections return the current size. *} .static inline bfd_size_type .bfd_get_section_limit_octets (const bfd *abfd, const asection *sec) .{ @@ -518,6 +520,9 @@ CODE_FRAGMENT . / bfd_octets_per_byte (abfd, sec)); .} . +.{* For input sections return the larger of the current size and the +. original size on disk of the section. For output sections return +. the current size. *} .static inline bfd_size_type .bfd_get_section_alloc_size (const bfd *abfd, const asection *sec) .{ diff --git a/bfd/libbfd.c b/bfd/libbfd.c index d33f341..0026c37 100644 --- a/bfd/libbfd.c +++ b/bfd/libbfd.c @@ -943,15 +943,7 @@ _bfd_generic_get_section_contents (bfd *abfd, return false; } - /* We do allow reading of a section after bfd_final_link has - written the contents out to disk. In that situation, rawsize is - just a stale version of size, so ignore it. Otherwise we must be - reading an input section, where rawsize, if different to size, - is the on-disk size. */ - if (abfd->direction != write_direction && section->rawsize != 0) - sz = section->rawsize; - else - sz = section->size; + sz = bfd_get_section_limit_octets (abfd, section); if (offset + count < count || offset + count > sz || (abfd->my_archive != NULL diff --git a/bfd/section.c b/bfd/section.c index a49778e..893fc91 100644 --- a/bfd/section.c +++ b/bfd/section.c @@ -1550,10 +1550,7 @@ bfd_get_section_contents (bfd *abfd, return true; } - if (abfd->direction != write_direction && section->rawsize != 0) - sz = section->rawsize; - else - sz = section->size; + sz = bfd_get_section_limit_octets (abfd, section); if ((bfd_size_type) offset > sz || count > sz - offset || count != (size_t) count) |