X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fihex.c;h=27e197dcbe2cca2205fb9737941dff6649acc74a;hb=de3da6457440a16311c7972e673a3c33e9621763;hp=a7636a9027e07660e878eb403c026d661b8f7c2f;hpb=082b7297014d9ccc3990c3c6be689dd18946d826;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/ihex.c b/bfd/ihex.c index a7636a9027..27e197dcbe 100644 --- a/bfd/ihex.c +++ b/bfd/ihex.c @@ -1,13 +1,12 @@ /* BFD back-end for Intel Hex objects. - Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1995-2016 Free Software Foundation, Inc. Written by Ian Lance Taylor of Cygnus Support . This file is part of BFD, the Binary File Descriptor library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,7 +16,9 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ + /* This is what Intel Hex files look like: @@ -116,42 +117,14 @@ The MRI compiler uses this, which is a repeat of type 5: 10..13 Upper 16 bits of start address 14..17 Lower 16 bits of start address 18..19 Checksum in hex notation - 20..21 Carriage return, line feed -*/ + 20..21 Carriage return, line feed. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "libiberty.h" #include "safe-ctype.h" -static void ihex_init - PARAMS ((void)); -static bfd_boolean ihex_mkobject - PARAMS ((bfd *)); -static INLINE int ihex_get_byte - PARAMS ((bfd *, bfd_boolean *)); -static void ihex_bad_byte - PARAMS ((bfd *, unsigned int, int, bfd_boolean)); -static bfd_boolean ihex_scan - PARAMS ((bfd *)); -static const bfd_target *ihex_object_p - PARAMS ((bfd *)); -static bfd_boolean ihex_read_section - PARAMS ((bfd *, asection *, bfd_byte *)); -static bfd_boolean ihex_get_section_contents - PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); -static bfd_boolean ihex_set_section_contents - PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type)); -static bfd_boolean ihex_write_record - PARAMS ((bfd *, size_t, unsigned int, unsigned int, bfd_byte *)); -static bfd_boolean ihex_write_object_contents - PARAMS ((bfd *)); -static bfd_boolean ihex_set_arch_mach - PARAMS ((bfd *, enum bfd_architecture, unsigned long)); -static int ihex_sizeof_headers - PARAMS ((bfd *, bfd_boolean)); - /* The number of bytes we put on one line during output. */ #define CHUNK 16 @@ -185,7 +158,7 @@ struct ihex_data_struct /* Initialize by filling in the hex conversion array. */ static void -ihex_init () +ihex_init (void) { static bfd_boolean inited; @@ -199,13 +172,11 @@ ihex_init () /* Create an ihex object. */ static bfd_boolean -ihex_mkobject (abfd) - bfd *abfd; +ihex_mkobject (bfd *abfd) { struct ihex_data_struct *tdata; - bfd_size_type amt = sizeof (struct ihex_data_struct); - tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt); + tdata = (struct ihex_data_struct *) bfd_alloc (abfd, sizeof (* tdata)); if (tdata == NULL) return FALSE; @@ -219,9 +190,7 @@ ihex_mkobject (abfd) Return EOF on error or end of file. */ static INLINE int -ihex_get_byte (abfd, errorptr) - bfd *abfd; - bfd_boolean *errorptr; +ihex_get_byte (bfd *abfd, bfd_boolean *errorptr) { bfd_byte c; @@ -238,11 +207,7 @@ ihex_get_byte (abfd, errorptr) /* Report a problem in an Intel Hex file. */ static void -ihex_bad_byte (abfd, lineno, c, error) - bfd *abfd; - unsigned int lineno; - int c; - bfd_boolean error; +ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error) { if (c == EOF) { @@ -254,15 +219,15 @@ ihex_bad_byte (abfd, lineno, c, error) char buf[10]; if (! ISPRINT (c)) - sprintf (buf, "\\%03o", (unsigned int) c); + sprintf (buf, "\\%03o", (unsigned int) c & 0xff); else { buf[0] = c; buf[1] = '\0'; } (*_bfd_error_handler) - (_("%s:%d: unexpected character `%s' in Intel Hex file\n"), - bfd_archive_filename (abfd), lineno, buf); + (_("%B:%d: unexpected character `%s' in Intel Hex file"), + abfd, lineno, buf); bfd_set_error (bfd_error_bad_value); } } @@ -271,8 +236,7 @@ ihex_bad_byte (abfd, lineno, c, error) section for each contiguous set of bytes. */ static bfd_boolean -ihex_scan (abfd) - bfd *abfd; +ihex_scan (bfd *abfd) { bfd_vma segbase; bfd_vma extbase; @@ -312,7 +276,7 @@ ihex_scan (abfd) else { file_ptr pos; - char hdr[8]; + unsigned char hdr[8]; unsigned int i; unsigned int len; bfd_vma addr; @@ -357,7 +321,7 @@ ihex_scan (abfd) { if (! ISHEX (buf[i])) { - ihex_bad_byte (abfd, lineno, hdr[i], error); + ihex_bad_byte (abfd, lineno, buf[i], error); goto error_return; } } @@ -369,8 +333,8 @@ ihex_scan (abfd) if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i)) { (*_bfd_error_handler) - (_("%s:%u: bad checksum in Intel Hex file (expected %u, found %u)"), - bfd_archive_filename (abfd), lineno, + (_("%B:%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); goto error_return; @@ -392,6 +356,7 @@ ihex_scan (abfd) char secbuf[20]; char *secname; bfd_size_type amt; + flagword flags; sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1); amt = strlen (secbuf) + 1; @@ -399,10 +364,10 @@ ihex_scan (abfd) if (secname == NULL) goto error_return; strcpy (secname, secbuf); - sec = bfd_make_section (abfd, secname); + flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC; + sec = bfd_make_section_with_flags (abfd, secname, flags); if (sec == NULL) goto error_return; - sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC; sec->vma = extbase + segbase + addr; sec->lma = extbase + segbase + addr; sec->size = len; @@ -423,8 +388,8 @@ ihex_scan (abfd) if (len != 2) { (*_bfd_error_handler) - (_("%s:%u: bad extended address record length in Intel Hex file"), - bfd_archive_filename (abfd), lineno); + (_("%B:%u: bad extended address record length in Intel Hex file"), + abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -440,8 +405,8 @@ ihex_scan (abfd) if (len != 4) { (*_bfd_error_handler) - (_("%s:%u: bad extended start address length in Intel Hex file"), - bfd_archive_filename (abfd), lineno); + (_("%B:%u: bad extended start address length in Intel Hex file"), + abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -457,8 +422,8 @@ ihex_scan (abfd) if (len != 2) { (*_bfd_error_handler) - (_("%s:%u: bad extended linear address record length in Intel Hex file"), - bfd_archive_filename (abfd), lineno); + (_("%B:%u: bad extended linear address record length in Intel Hex file"), + abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -474,8 +439,8 @@ ihex_scan (abfd) if (len != 2 && len != 4) { (*_bfd_error_handler) - (_("%s:%u: bad extended linear start address length in Intel Hex file"), - bfd_archive_filename (abfd), lineno); + (_("%B:%u: bad extended linear start address length in Intel Hex file"), + abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -491,8 +456,8 @@ ihex_scan (abfd) default: (*_bfd_error_handler) - (_("%s:%u: unrecognized ihex type %u in Intel Hex file\n"), - bfd_archive_filename (abfd), lineno, type); + (_("%B:%u: unrecognized ihex type %u in Intel Hex file"), + abfd, lineno, type); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -516,10 +481,9 @@ ihex_scan (abfd) /* Try to recognize an Intel Hex file. */ static const bfd_target * -ihex_object_p (abfd) - bfd *abfd; +ihex_object_p (bfd *abfd) { - PTR tdata_save; + void * tdata_save; bfd_byte b[9]; unsigned int i; unsigned int type; @@ -573,10 +537,7 @@ ihex_object_p (abfd) /* Read the contents of a section in an Intel Hex file. */ static bfd_boolean -ihex_read_section (abfd, section, contents) - bfd *abfd; - asection *section; - bfd_byte *contents; +ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents) { int c; bfd_byte *p; @@ -592,9 +553,8 @@ ihex_read_section (abfd, section, contents) error = FALSE; while ((c = ihex_get_byte (abfd, &error)) != EOF) { - char hdr[8]; + unsigned char hdr[8]; unsigned int len; - bfd_vma addr; unsigned int type; unsigned int i; @@ -609,15 +569,13 @@ ihex_read_section (abfd, section, contents) goto error_return; len = HEX2 (hdr); - addr = HEX4 (hdr + 2); type = HEX2 (hdr + 6); /* We should only see type 0 records here. */ if (type != 0) { (*_bfd_error_handler) - (_("%s: internal error in ihex_read_section"), - bfd_archive_filename (abfd)); + (_("%B: internal error in ihex_read_section"), abfd); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -651,8 +609,7 @@ ihex_read_section (abfd, section, contents) if ((bfd_size_type) (p - contents) < section->size) { (*_bfd_error_handler) - (_("%s: bad section length in ihex_read_section"), - bfd_archive_filename (abfd)); + (_("%B: bad section length in ihex_read_section"), abfd); bfd_set_error (bfd_error_bad_value); goto error_return; } @@ -671,19 +628,19 @@ ihex_read_section (abfd, section, contents) /* Get the contents of a section in an Intel Hex file. */ static bfd_boolean -ihex_get_section_contents (abfd, section, location, offset, count) - bfd *abfd; - asection *section; - PTR location; - file_ptr offset; - bfd_size_type count; +ihex_get_section_contents (bfd *abfd, + asection *section, + void * location, + file_ptr offset, + bfd_size_type count) { if (section->used_by_bfd == NULL) { section->used_by_bfd = bfd_alloc (abfd, section->size); if (section->used_by_bfd == NULL) return FALSE; - if (! ihex_read_section (abfd, section, section->used_by_bfd)) + if (! ihex_read_section (abfd, section, + (bfd_byte *) section->used_by_bfd)) return FALSE; } @@ -696,25 +653,22 @@ ihex_get_section_contents (abfd, section, location, offset, count) /* Set the contents of a section in an Intel Hex file. */ static bfd_boolean -ihex_set_section_contents (abfd, section, location, offset, count) - bfd *abfd; - asection *section; - const PTR location; - file_ptr offset; - bfd_size_type count; +ihex_set_section_contents (bfd *abfd, + asection *section, + const void * location, + file_ptr offset, + bfd_size_type count) { struct ihex_data_list *n; bfd_byte *data; struct ihex_data_struct *tdata; - bfd_size_type amt; if (count == 0 || (section->flags & SEC_ALLOC) == 0 || (section->flags & SEC_LOAD) == 0) return TRUE; - amt = sizeof (struct ihex_data_list); - n = (struct ihex_data_list *) bfd_alloc (abfd, amt); + n = (struct ihex_data_list *) bfd_alloc (abfd, sizeof (* n)); if (n == NULL) return FALSE; @@ -739,7 +693,7 @@ ihex_set_section_contents (abfd, section, location, offset, count) } else { - register struct ihex_data_list **pp; + struct ihex_data_list **pp; for (pp = &tdata->head; *pp != NULL && (*pp)->where < n->where; @@ -757,12 +711,11 @@ ihex_set_section_contents (abfd, section, location, offset, count) /* Write a record out to an Intel Hex file. */ static bfd_boolean -ihex_write_record (abfd, count, addr, type, data) - bfd *abfd; - size_t count; - unsigned int addr; - unsigned int type; - bfd_byte *data; +ihex_write_record (bfd *abfd, + size_t count, + unsigned int addr, + unsigned int type, + bfd_byte *data) { static const char digs[] = "0123456789ABCDEF"; char buf[9 + CHUNK * 2 + 4]; @@ -802,8 +755,7 @@ ihex_write_record (abfd, count, addr, type, data) /* Write out an Intel Hex file. */ static bfd_boolean -ihex_write_object_contents (abfd) - bfd *abfd; +ihex_write_object_contents (bfd *abfd) { bfd_vma segbase; bfd_vma extbase; @@ -820,6 +772,7 @@ ihex_write_object_contents (abfd) where = l->where; p = l->data; count = l->size; + while (count > 0) { size_t now; @@ -933,10 +886,9 @@ ihex_write_object_contents (abfd) irrelevant, so we ignore errors about unknown architectures. */ static bfd_boolean -ihex_set_arch_mach (abfd, arch, mach) - bfd *abfd; - enum bfd_architecture arch; - unsigned long mach; +ihex_set_arch_mach (bfd *abfd, + enum bfd_architecture arch, + unsigned long mach) { if (! bfd_default_set_arch_mach (abfd, arch, mach)) { @@ -949,79 +901,74 @@ ihex_set_arch_mach (abfd, arch, mach) /* Get the size of the headers, for the linker. */ static int -ihex_sizeof_headers (abfd, exec) - bfd *abfd ATTRIBUTE_UNUSED; - bfd_boolean exec ATTRIBUTE_UNUSED; +ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { return 0; } /* Some random definitions for the target vector. */ -#define ihex_close_and_cleanup _bfd_generic_close_and_cleanup -#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 (*) PARAMS ((bfd *, asymbol **))) bfd_0l) -#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_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_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols -#define ihex_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol - -#define ihex_get_reloc_upper_bound \ - ((long (*) PARAMS ((bfd *, asection *))) bfd_0l) -#define ihex_canonicalize_reloc \ - ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l) -#define ihex_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup - -#define ihex_bfd_get_relocated_section_contents \ - bfd_generic_get_relocated_section_contents -#define ihex_bfd_relax_section bfd_generic_relax_section -#define ihex_bfd_gc_sections bfd_generic_gc_sections -#define ihex_bfd_merge_sections bfd_generic_merge_sections -#define ihex_bfd_is_group_section bfd_generic_is_group_section -#define ihex_bfd_discard_group bfd_generic_discard_group -#define ihex_section_already_linked \ - _bfd_generic_section_already_linked -#define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define ihex_bfd_link_hash_table_free _bfd_generic_link_hash_table_free -#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define ihex_bfd_link_just_syms _bfd_generic_link_just_syms -#define ihex_bfd_final_link _bfd_generic_final_link -#define ihex_bfd_link_split_section _bfd_generic_link_split_section +#define ihex_close_and_cleanup _bfd_generic_close_and_cleanup +#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_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_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_find_line _bfd_nosymbols_find_line +#define ihex_find_inliner_info _bfd_nosymbols_find_inliner_info +#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols +#define ihex_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol +#define ihex_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents +#define ihex_bfd_relax_section bfd_generic_relax_section +#define ihex_bfd_gc_sections bfd_generic_gc_sections +#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_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_hash_table_create _bfd_generic_link_hash_table_create +#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define ihex_bfd_link_just_syms _bfd_generic_link_just_syms +#define ihex_bfd_copy_link_hash_symbol_type _bfd_generic_copy_link_hash_symbol_type +#define ihex_bfd_final_link _bfd_generic_final_link +#define ihex_bfd_link_split_section _bfd_generic_link_split_section +#define ihex_bfd_link_check_relocs _bfd_generic_link_check_relocs /* The Intel Hex target vector. */ const bfd_target ihex_vec = { - "ihex", /* name */ + "ihex", /* Name. */ bfd_target_ihex_flavour, - BFD_ENDIAN_UNKNOWN, /* target byte order */ - BFD_ENDIAN_UNKNOWN, /* target headers byte order */ - 0, /* object flags */ - (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ + BFD_ENDIAN_UNKNOWN, /* Target byte order. */ + BFD_ENDIAN_UNKNOWN, /* Target headers byte order. */ + 0, /* Object flags. */ + (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD), /* Section flags. */ + 0, /* Leading underscore. */ + ' ', /* AR_pad_char. */ + 16, /* AR_max_namelen. */ + 0, /* match priority. */ 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_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */ bfd_getb64, bfd_getb_signed_64, bfd_putb64, bfd_getb32, bfd_getb_signed_32, bfd_putb32, - bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */ + bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Headers. */ { _bfd_dummy_target, - ihex_object_p, /* bfd_check_format */ + ihex_object_p, /* bfd_check_format. */ _bfd_dummy_target, _bfd_dummy_target, }, @@ -1031,7 +978,7 @@ const bfd_target ihex_vec = _bfd_generic_mkarchive, bfd_false, }, - { /* bfd_write_contents */ + { /* bfd_write_contents. */ bfd_false, ihex_write_object_contents, _bfd_write_archive_contents, @@ -1043,12 +990,12 @@ const bfd_target ihex_vec = BFD_JUMP_TABLE_CORE (_bfd_nocore), BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), BFD_JUMP_TABLE_SYMBOLS (ihex), - BFD_JUMP_TABLE_RELOCS (ihex), + BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), BFD_JUMP_TABLE_WRITE (ihex), BFD_JUMP_TABLE_LINK (ihex), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), NULL, - (PTR) 0 + NULL };