X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fihex.c;h=c692b03b33abff2f4acd20d1def073a30d34d0b1;hb=c1299d67f5e87927ba19ac99524d238905b9c406;hp=8bb51349f0729f02ad3e028763f311952551e31d;hpb=3f3c5c340426c1a7d0006cd92f68d394a100d287;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/ihex.c b/bfd/ihex.c index 8bb51349f0..c692b03b33 100644 --- a/bfd/ihex.c +++ b/bfd/ihex.c @@ -1,23 +1,23 @@ /* BFD back-end for Intel Hex objects. - Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002 + Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Written by Ian Lance Taylor of Cygnus Support . -This file is part of BFD, the Binary File Descriptor library. + 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 -(at your option) any later version. + 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 + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -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. */ + 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. */ /* This is what Intel Hex files look like: @@ -125,34 +125,43 @@ The MRI compiler uses this, which is a repeat of type 5: #include "libiberty.h" #include "safe-ctype.h" -static void ihex_init PARAMS ((void)); -static boolean ihex_mkobject PARAMS ((bfd *)); -static INLINE int ihex_get_byte PARAMS ((bfd *, boolean *)); -static void ihex_bad_byte PARAMS ((bfd *, unsigned int, int, boolean)); -static boolean ihex_scan PARAMS ((bfd *)); -static const bfd_target *ihex_object_p PARAMS ((bfd *)); -static boolean ihex_read_section PARAMS ((bfd *, asection *, bfd_byte *)); -static boolean ihex_get_section_contents +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 boolean ihex_set_section_contents - PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); -static boolean ihex_write_record +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 boolean ihex_write_object_contents PARAMS ((bfd *)); -static boolean ihex_set_arch_mach +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 *, boolean)); +static int ihex_sizeof_headers + PARAMS ((bfd *, bfd_boolean)); /* The number of bytes we put on one line during output. */ #define CHUNK 16 -/* Macros for converting between hex and binary. */ +/* Macros for converting between hex and binary. */ -#define NIBBLE(x) (hex_value (x)) +#define NIBBLE(x) (hex_value (x)) #define HEX2(buffer) ((NIBBLE ((buffer)[0]) << 4) + NIBBLE ((buffer)[1])) #define HEX4(buffer) ((HEX2 (buffer) << 8) + HEX2 ((buffer) + 2)) -#define ISHEX(x) (hex_p (x)) +#define ISHEX(x) (hex_p (x)) /* When we write out an ihex value, the values can not be output as they are seen. Instead, we hold them in memory in this structure. */ @@ -178,35 +187,32 @@ struct ihex_data_struct static void ihex_init () { - static boolean inited; + static bfd_boolean inited; if (! inited) { - inited = true; + inited = TRUE; hex_init (); } } /* Create an ihex object. */ -static boolean +static bfd_boolean ihex_mkobject (abfd) bfd *abfd; { - if (abfd->tdata.ihex_data == NULL) - { - struct ihex_data_struct *tdata; - bfd_size_type amt = sizeof (struct ihex_data_struct); - - tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt); - if (tdata == NULL) - return false; - abfd->tdata.ihex_data = tdata; - tdata->head = NULL; - tdata->tail = NULL; - } + struct ihex_data_struct *tdata; + bfd_size_type amt = sizeof (struct ihex_data_struct); + + tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt); + if (tdata == NULL) + return FALSE; - return true; + abfd->tdata.ihex_data = tdata; + tdata->head = NULL; + tdata->tail = NULL; + return TRUE; } /* Read a byte from a BFD. Set *ERRORPTR if an error occurred. @@ -215,14 +221,14 @@ ihex_mkobject (abfd) static INLINE int ihex_get_byte (abfd, errorptr) bfd *abfd; - boolean *errorptr; + bfd_boolean *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; } @@ -236,7 +242,7 @@ ihex_bad_byte (abfd, lineno, c, error) bfd *abfd; unsigned int lineno; int c; - boolean error; + bfd_boolean error; { if (c == EOF) { @@ -255,8 +261,8 @@ ihex_bad_byte (abfd, lineno, c, error) 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); } } @@ -264,7 +270,7 @@ ihex_bad_byte (abfd, lineno, c, error) /* Read an Intel hex file and turn it into sections. We create a new section for each contiguous set of bytes. */ -static boolean +static bfd_boolean ihex_scan (abfd) bfd *abfd; { @@ -272,7 +278,7 @@ ihex_scan (abfd) bfd_vma extbase; asection *sec; unsigned int lineno; - boolean error; + bfd_boolean error; bfd_byte *buf = NULL; size_t bufsize; int c; @@ -286,8 +292,9 @@ ihex_scan (abfd) extbase = 0; sec = NULL; lineno = 1; - error = false; + error = FALSE; bufsize = 0; + while ((c = ihex_get_byte (abfd, &error)) != EOF) { if (c == '\r') @@ -314,11 +321,9 @@ ihex_scan (abfd) unsigned int chksum; /* This is a data record. */ - pos = bfd_tell (abfd) - 1; /* Read the header bytes. */ - if (bfd_bread (hdr, (bfd_size_type) 8, abfd) != 8) goto error_return; @@ -336,7 +341,6 @@ ihex_scan (abfd) type = HEX2 (hdr + 6); /* Read the data bytes. */ - chars = len * 2 + 2; if (chars >= bufsize) { @@ -365,8 +369,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; @@ -377,11 +381,11 @@ ihex_scan (abfd) case 0: /* This is a data record. */ if (sec != NULL - && sec->vma + sec->_raw_size == extbase + segbase + addr) + && sec->vma + sec->size == extbase + segbase + addr) { /* This data goes at the end of the section we are currently building. */ - sec->_raw_size += len; + sec->size += len; } else if (len > 0) { @@ -401,7 +405,7 @@ ihex_scan (abfd) sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC; sec->vma = extbase + segbase + addr; sec->lma = extbase + segbase + addr; - sec->_raw_size = len; + sec->size = len; sec->filepos = pos; } break; @@ -412,15 +416,15 @@ ihex_scan (abfd) abfd->start_address = addr; if (buf != NULL) free (buf); - return true; + return TRUE; case 2: /* An extended address record. */ 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; } @@ -436,8 +440,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; } @@ -453,8 +457,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; } @@ -470,8 +474,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; } @@ -487,8 +491,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; } @@ -501,12 +505,12 @@ ihex_scan (abfd) if (buf != NULL) free (buf); - return true; + return TRUE; error_return: if (buf != NULL) free (buf); - return false; + return FALSE; } /* Try to recognize an Intel Hex file. */ @@ -515,6 +519,7 @@ static const bfd_target * ihex_object_p (abfd) bfd *abfd; { + PTR tdata_save; bfd_byte b[9]; unsigned int i; unsigned int type; @@ -553,17 +558,21 @@ ihex_object_p (abfd) } /* OK, it looks like it really is an Intel Hex file. */ - - if (! ihex_mkobject (abfd) - || ! ihex_scan (abfd)) - return NULL; + tdata_save = abfd->tdata.any; + if (! ihex_mkobject (abfd) || ! ihex_scan (abfd)) + { + if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL) + bfd_release (abfd, abfd->tdata.any); + abfd->tdata.any = tdata_save; + return NULL; + } return abfd->xvec; } /* Read the contents of a section in an Intel Hex file. */ -static boolean +static bfd_boolean ihex_read_section (abfd, section, contents) bfd *abfd; asection *section; @@ -573,14 +582,14 @@ ihex_read_section (abfd, section, contents) bfd_byte *p; bfd_byte *buf = NULL; size_t bufsize; - boolean error; + bfd_boolean 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) { char hdr[8]; @@ -607,8 +616,7 @@ ihex_read_section (abfd, section, contents) 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; } @@ -626,12 +634,12 @@ ihex_read_section (abfd, section, contents) for (i = 0; i < len; i++) *p++ = HEX2 (buf + 2 * i); - if ((bfd_size_type) (p - contents) >= section->_raw_size) + if ((bfd_size_type) (p - contents) >= section->size) { /* We've read everything in the section. */ if (buf != NULL) free (buf); - return true; + return TRUE; } /* Skip the checksum. */ @@ -639,11 +647,10 @@ ihex_read_section (abfd, section, contents) goto error_return; } - if ((bfd_size_type) (p - contents) < section->_raw_size) + 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; } @@ -651,17 +658,17 @@ ihex_read_section (abfd, section, contents) if (buf != NULL) free (buf); - return true; + return TRUE; error_return: if (buf != NULL) free (buf); - return false; + return FALSE; } /* Get the contents of a section in an Intel Hex file. */ -static boolean +static bfd_boolean ihex_get_section_contents (abfd, section, location, offset, count) bfd *abfd; asection *section; @@ -671,26 +678,26 @@ ihex_get_section_contents (abfd, section, location, offset, count) { if (section->used_by_bfd == NULL) { - section->used_by_bfd = bfd_alloc (abfd, section->_raw_size); + 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, 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 boolean +static bfd_boolean ihex_set_section_contents (abfd, section, location, offset, count) bfd *abfd; asection *section; - PTR location; + const PTR location; file_ptr offset; bfd_size_type count; { @@ -702,16 +709,16 @@ ihex_set_section_contents (abfd, section, location, offset, count) if (count == 0 || (section->flags & SEC_ALLOC) == 0 || (section->flags & SEC_LOAD) == 0) - return true; + return TRUE; amt = sizeof (struct ihex_data_list); n = (struct ihex_data_list *) bfd_alloc (abfd, amt); 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; @@ -742,12 +749,12 @@ ihex_set_section_contents (abfd, section, location, offset, count) tdata->tail = n; } - return true; + return TRUE; } /* Write a record out to an Intel Hex file. */ -static boolean +static bfd_boolean ihex_write_record (abfd, count, addr, type, data) bfd *abfd; size_t count; @@ -785,14 +792,14 @@ ihex_write_record (abfd, count, addr, type, data) 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 boolean +static bfd_boolean ihex_write_object_contents (abfd) bfd *abfd; { @@ -834,7 +841,7 @@ ihex_write_object_contents (abfd) 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 { @@ -849,7 +856,7 @@ ihex_write_object_contents (abfd) addr[0] = 0; addr[1] = 0; if (! ihex_write_record (abfd, 2, 0, 2, addr)) - return false; + return FALSE; segbase = 0; } @@ -860,21 +867,26 @@ ihex_write_object_contents (abfd) sprintf_vma (buf, where); (*_bfd_error_handler) - (_("%s: address 0x%s out of range for Intex Hex file"), + (_("%s: address 0x%s out of range for Intel Hex file"), bfd_get_filename (abfd), buf); 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; } } rec_addr = where - (extbase + segbase); + + /* Output records shouldn't cross 64K boundaries. */ + if (rec_addr + now > 0xffff) + now = 0x10000 - rec_addr; + if (! ihex_write_record (abfd, now, rec_addr, 0, p)) - return false; + return FALSE; where += now; p += now; @@ -896,7 +908,7 @@ ihex_write_object_contents (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 { @@ -905,20 +917,20 @@ ihex_write_object_contents (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 boolean +static bfd_boolean ihex_set_arch_mach (abfd, arch, mach) bfd *abfd; enum bfd_architecture arch; @@ -927,18 +939,17 @@ ihex_set_arch_mach (abfd, arch, 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. */ -/*ARGSUSED*/ static int ihex_sizeof_headers (abfd, exec) bfd *abfd ATTRIBUTE_UNUSED; - boolean exec ATTRIBUTE_UNUSED; + bfd_boolean exec ATTRIBUTE_UNUSED; { return 0; } @@ -952,11 +963,12 @@ ihex_sizeof_headers (abfd, exec) _bfd_generic_get_section_contents_in_window #define ihex_get_symtab_upper_bound bfd_0l -#define ihex_get_symtab \ +#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_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 @@ -975,8 +987,14 @@ ihex_sizeof_headers (abfd, exec) #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