/* BFD back-end for Intel Hex objects.
- Copyright (C) 1995-2017 Free Software Foundation, Inc.
+ Copyright (C) 1995-2021 Free Software Foundation, Inc.
Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
This file is part of BFD, the Binary File Descriptor library.
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)
+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;
}
/* 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)
{
}
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%d: unexpected character `%s' in Intel Hex file"),
+ (_("%pB:%d: unexpected character `%s' in Intel Hex file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
}
/* 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;
extbase = 0;
sec = NULL;
lineno = 1;
- error = FALSE;
+ error = false;
bufsize = 0;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
+ (_("%pB:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
abfd, lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
bfd_set_error (bfd_error_bad_value);
{
char secbuf[20];
char *secname;
- bfd_size_type amt;
+ size_t amt;
flagword flags;
sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
/* 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. */
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: bad extended address record length in Intel Hex file"),
+ (_("%pB:%u: bad extended address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: bad extended start address length in Intel Hex file"),
+ (_("%pB:%u: bad extended start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: bad extended linear address record length in Intel Hex file"),
+ (_("%pB:%u: bad extended linear address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: bad extended linear start address length in Intel Hex file"),
+ (_("%pB:%u: bad extended linear start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
default:
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
+ (_("%pB:%u: unrecognized ihex type %u in Intel Hex file"),
abfd, lineno, type);
bfd_set_error (bfd_error_bad_value);
goto error_return;
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;
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];
if (type != 0)
{
_bfd_error_handler
- (_("%B: internal error in ihex_read_section"), abfd);
+ (_("%pB: internal error in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
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. */
if ((bfd_size_type) (p - contents) < section->size)
{
_bfd_error_handler
- (_("%B: bad section length in ihex_read_section"), abfd);
+ (_("%pB: bad section length in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
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,
{
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,
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;
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,
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;
bfd_size_type count;
where = l->where;
+
+#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;
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
{
addr[0] = 0;
addr[1] = 0;
if (! ihex_write_record (abfd, 2, 0, 2, addr))
- return FALSE;
+ return false;
segbase = 0;
}
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B: address %#Lx out of range for Intel Hex file"),
- abfd, where);
+ (_("%pB: address %#" PRIx64
+ " 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;
}
}
now = 0x10000 - rec_addr;
if (! ihex_write_record (abfd, now, rec_addr, 0, p))
- return FALSE;
+ return false;
where += now;
p += now;
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
{
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)
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. */
#define ihex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
#define ihex_new_section_hook _bfd_generic_new_section_hook
#define ihex_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
-#define ihex_get_symtab_upper_bound bfd_0l
-#define ihex_canonicalize_symtab ((long (*) (bfd *, asymbol **)) bfd_0l)
+#define ihex_get_symtab_upper_bound _bfd_long_bfd_0
+#define ihex_canonicalize_symtab _bfd_nosymbols_canonicalize_symtab
#define ihex_make_empty_symbol _bfd_generic_make_empty_symbol
#define ihex_print_symbol _bfd_nosymbols_print_symbol
#define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info
#define ihex_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string
-#define ihex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ihex_bfd_is_target_special_symbol _bfd_bool_bfd_asymbol_false
#define ihex_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
#define ihex_get_lineno _bfd_nosymbols_get_lineno
#define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line
#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
+#define ihex_bfd_link_hide_symbol _bfd_generic_link_hide_symbol
#define ihex_bfd_define_start_stop bfd_generic_define_start_stop
#define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols
' ', /* 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. */
_bfd_dummy_target,
},
{
- bfd_false,
+ _bfd_bool_bfd_false_error,
ihex_mkobject,
_bfd_generic_mkarchive,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
{ /* bfd_write_contents. */
- bfd_false,
+ _bfd_bool_bfd_false_error,
ihex_write_object_contents,
_bfd_write_archive_contents,
- bfd_false,
+ _bfd_bool_bfd_false_error,
},
BFD_JUMP_TABLE_GENERIC (ihex),
projects / deliverable / binutils-gdb.git / blobdiff