X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=bfd%2Fihex.c;h=cccec8f164eb3b54a5def7366150f99da903facb;hb=77b38f6db98e046232ecaac11b61c453965fb75a;hp=5d7d8fffeaaabc992e3923866e679e7e1daaf644;hpb=827041555ac443bd57340060f3e034fd7b199dd8;p=binutils-gdb.git diff --git a/bfd/ihex.c b/bfd/ihex.c index 5d7d8fffeaa..cccec8f164e 100644 --- a/bfd/ihex.c +++ b/bfd/ihex.c @@ -1,5 +1,5 @@ /* BFD back-end for Intel Hex objects. - Copyright (C) 1995-2019 Free Software Foundation, Inc. + Copyright (C) 1995-2022 Free Software Foundation, Inc. Written by Ian Lance Taylor of Cygnus Support . This file is part of BFD, the Binary File Descriptor library. @@ -160,44 +160,44 @@ struct ihex_data_struct static void ihex_init (void) { - static bfd_boolean inited; + static bool inited; if (! inited) { - inited = TRUE; + inited = true; hex_init (); } } /* Create an ihex object. */ -static bfd_boolean +static bool ihex_mkobject (bfd *abfd) { struct ihex_data_struct *tdata; tdata = (struct ihex_data_struct *) bfd_alloc (abfd, sizeof (* tdata)); if (tdata == NULL) - return FALSE; + return false; abfd->tdata.ihex_data = tdata; tdata->head = NULL; tdata->tail = NULL; - return TRUE; + return true; } /* Read a byte from a BFD. Set *ERRORPTR if an error occurred. Return EOF on error or end of file. */ -static INLINE int -ihex_get_byte (bfd *abfd, bfd_boolean *errorptr) +static inline int +ihex_get_byte (bfd *abfd, bool *errorptr) { bfd_byte c; if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1) { if (bfd_get_error () != bfd_error_file_truncated) - *errorptr = TRUE; + *errorptr = true; return EOF; } @@ -207,7 +207,7 @@ ihex_get_byte (bfd *abfd, bfd_boolean *errorptr) /* Report a problem in an Intel Hex file. */ static void -ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error) +ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bool error) { if (c == EOF) { @@ -236,14 +236,14 @@ ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error) /* Read an Intel hex file and turn it into sections. We create a new section for each contiguous set of bytes. */ -static bfd_boolean +static bool ihex_scan (bfd *abfd) { bfd_vma segbase; bfd_vma extbase; asection *sec; unsigned int lineno; - bfd_boolean error; + bool error; bfd_byte *buf = NULL; size_t bufsize; int c; @@ -257,7 +257,7 @@ ihex_scan (bfd *abfd) extbase = 0; sec = NULL; lineno = 1; - error = FALSE; + error = false; bufsize = 0; while ((c = ihex_get_byte (abfd, &error)) != EOF) @@ -357,7 +357,7 @@ ihex_scan (bfd *abfd) { char secbuf[20]; char *secname; - bfd_size_type amt; + size_t amt; flagword flags; sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1); @@ -381,9 +381,8 @@ ihex_scan (bfd *abfd) /* An end record. */ if (abfd->start_address == 0) abfd->start_address = addr; - if (buf != NULL) - free (buf); - return TRUE; + free (buf); + return true; case 2: /* An extended address record. */ @@ -474,20 +473,17 @@ ihex_scan (bfd *abfd) if (error) goto error_return; - if (buf != NULL) - free (buf); - - return TRUE; + free (buf); + return true; error_return: - if (buf != NULL) - free (buf); - return FALSE; + free (buf); + return false; } /* Try to recognize an Intel Hex file. */ -static const bfd_target * +static bfd_cleanup ihex_object_p (bfd *abfd) { void * tdata_save; @@ -538,26 +534,26 @@ ihex_object_p (bfd *abfd) return NULL; } - return abfd->xvec; + return _bfd_no_cleanup; } /* Read the contents of a section in an Intel Hex file. */ -static bfd_boolean +static bool ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents) { int c; bfd_byte *p; bfd_byte *buf = NULL; size_t bufsize; - bfd_boolean error; + bool error; if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0) goto error_return; p = contents; bufsize = 0; - error = FALSE; + error = false; while ((c = ihex_get_byte (abfd, &error)) != EOF) { unsigned char hdr[8]; @@ -603,9 +599,8 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents) if ((bfd_size_type) (p - contents) >= section->size) { /* We've read everything in the section. */ - if (buf != NULL) - free (buf); - return TRUE; + free (buf); + return true; } /* Skip the checksum. */ @@ -621,20 +616,17 @@ ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents) goto error_return; } - if (buf != NULL) - free (buf); - - return TRUE; + free (buf); + return true; error_return: - if (buf != NULL) - free (buf); - return FALSE; + free (buf); + return false; } /* Get the contents of a section in an Intel Hex file. */ -static bfd_boolean +static bool ihex_get_section_contents (bfd *abfd, asection *section, void * location, @@ -645,21 +637,21 @@ ihex_get_section_contents (bfd *abfd, { section->used_by_bfd = bfd_alloc (abfd, section->size); if (section->used_by_bfd == NULL) - return FALSE; + return false; if (! ihex_read_section (abfd, section, (bfd_byte *) section->used_by_bfd)) - return FALSE; + return false; } memcpy (location, (bfd_byte *) section->used_by_bfd + offset, (size_t) count); - return TRUE; + return true; } /* Set the contents of a section in an Intel Hex file. */ -static bfd_boolean +static bool ihex_set_section_contents (bfd *abfd, asection *section, const void * location, @@ -673,15 +665,15 @@ ihex_set_section_contents (bfd *abfd, if (count == 0 || (section->flags & SEC_ALLOC) == 0 || (section->flags & SEC_LOAD) == 0) - return TRUE; + return true; n = (struct ihex_data_list *) bfd_alloc (abfd, sizeof (* n)); if (n == NULL) - return FALSE; + return false; data = (bfd_byte *) bfd_alloc (abfd, count); if (data == NULL) - return FALSE; + return false; memcpy (data, location, (size_t) count); n->data = data; @@ -712,12 +704,12 @@ ihex_set_section_contents (bfd *abfd, tdata->tail = n; } - return TRUE; + return true; } /* Write a record out to an Intel Hex file. */ -static bfd_boolean +static bool ihex_write_record (bfd *abfd, size_t count, unsigned int addr, @@ -754,14 +746,14 @@ ihex_write_record (bfd *abfd, total = 9 + count * 2 + 4; if (bfd_bwrite (buf, (bfd_size_type) total, abfd) != total) - return FALSE; + return false; - return TRUE; + return true; } /* Write out an Intel Hex file. */ -static bfd_boolean +static bool ihex_write_object_contents (bfd *abfd) { bfd_vma segbase; @@ -775,25 +767,29 @@ ihex_write_object_contents (bfd *abfd) bfd_vma where; bfd_byte *p; bfd_size_type count; - const bfd_vma sign = (bfd_vma) 0xffffffff80000000ULL; - const bfd_vma top = (bfd_vma) 0xffffffff00000000ULL; where = l->where; - /* Check for unacceptable addresses sign extension. - See PR 23699 for more details. */ - if ((where & sign) == top - || ((where & top) != 0 && (where & top) != top)) - { - _bfd_error_handler - /* xgettext:c-format */ - (_("%pB 64-bit address %#" PRIx64 " out of range for Intel Hex file"), - abfd, (uint64_t) where); - bfd_set_error (bfd_error_bad_value); - return FALSE; - } - +#ifdef BFD64 + /* IHex only supports 32-bit addresses, and we want to check + that 64-bit addresses are in range. This isn't quite as + obvious as it may seem, since some targets have 32-bit + addresses that are sign extended to 64 bits. So complain + only if addresses overflow both unsigned and signed 32-bit + integers. */ + if (where > 0xffffffff + && where + 0x80000000 > 0xffffffff) + { + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB 64-bit address %#" PRIx64 + " out of range for Intel Hex file"), + abfd, (uint64_t) where); + bfd_set_error (bfd_error_bad_value); + return false; + } where &= 0xffffffff; +#endif p = l->data; count = l->size; @@ -807,21 +803,20 @@ ihex_write_object_contents (bfd *abfd) if (count > CHUNK) now = CHUNK; - if (where > segbase + extbase + 0xffff) + if (where < extbase + || where - extbase < segbase + || where - extbase - segbase > 0xffff) { bfd_byte addr[2]; /* We need a new base address. */ - if (where <= 0xfffff) + if (extbase == 0 && where <= 0xfffff) { - /* The addresses should be sorted. */ - BFD_ASSERT (extbase == 0); - segbase = where & 0xf0000; addr[0] = (bfd_byte)(segbase >> 12) & 0xff; addr[1] = (bfd_byte)(segbase >> 4) & 0xff; if (! ihex_write_record (abfd, 2, 0, 2, addr)) - return FALSE; + return false; } else { @@ -836,7 +831,7 @@ ihex_write_object_contents (bfd *abfd) addr[0] = 0; addr[1] = 0; if (! ihex_write_record (abfd, 2, 0, 2, addr)) - return FALSE; + return false; segbase = 0; } @@ -849,12 +844,12 @@ ihex_write_object_contents (bfd *abfd) " out of range for Intel Hex file"), abfd, (uint64_t) where); bfd_set_error (bfd_error_bad_value); - return FALSE; + return false; } addr[0] = (bfd_byte)(extbase >> 24) & 0xff; addr[1] = (bfd_byte)(extbase >> 16) & 0xff; if (! ihex_write_record (abfd, 2, 0, 4, addr)) - return FALSE; + return false; } } @@ -865,7 +860,7 @@ ihex_write_object_contents (bfd *abfd) now = 0x10000 - rec_addr; if (! ihex_write_record (abfd, now, rec_addr, 0, p)) - return FALSE; + return false; where += now; p += now; @@ -887,7 +882,7 @@ ihex_write_object_contents (bfd *abfd) startbuf[2] = (bfd_byte)(start >> 8) & 0xff; startbuf[3] = (bfd_byte)start & 0xff; if (! ihex_write_record (abfd, 4, 0, 3, startbuf)) - return FALSE; + return false; } else { @@ -896,20 +891,20 @@ ihex_write_object_contents (bfd *abfd) startbuf[2] = (bfd_byte)(start >> 8) & 0xff; startbuf[3] = (bfd_byte)start & 0xff; if (! ihex_write_record (abfd, 4, 0, 5, startbuf)) - return FALSE; + return false; } } if (! ihex_write_record (abfd, 0, 0, 1, NULL)) - return FALSE; + return false; - return TRUE; + return true; } /* Set the architecture for the output file. The architecture is irrelevant, so we ignore errors about unknown architectures. */ -static bfd_boolean +static bool ihex_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach) @@ -917,9 +912,9 @@ ihex_set_arch_mach (bfd *abfd, if (! bfd_default_set_arch_mach (abfd, arch, mach)) { if (arch != bfd_arch_unknown) - return FALSE; + return false; } - return TRUE; + return true; } /* Get the size of the headers, for the linker. */ @@ -958,6 +953,7 @@ ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, #define ihex_bfd_lookup_section_flags bfd_generic_lookup_section_flags #define ihex_bfd_merge_sections bfd_generic_merge_sections #define ihex_bfd_is_group_section bfd_generic_is_group_section +#define ihex_bfd_group_name bfd_generic_group_name #define ihex_bfd_discard_group bfd_generic_discard_group #define ihex_section_already_linked _bfd_generic_section_already_linked #define ihex_bfd_define_common_symbol bfd_generic_define_common_symbol @@ -985,6 +981,7 @@ const bfd_target ihex_vec = ' ', /* AR_pad_char. */ 16, /* AR_max_namelen. */ 0, /* match priority. */ + TARGET_KEEP_UNUSED_SECTION_SYMBOLS, /* keep unused section symbols. */ bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */