X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fsrec.c;h=5fdd68bdd0f8066e019028acb4020a50b024bad5;hb=46a2d504dd875caf60f9be191a55c9ff676bcd5c;hp=0987051e73ad1304dade3e317a96a651b2c863b1;hpb=dc810e3900d47ab2eea86d50231ff2e70b596847;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/srec.c b/bfd/srec.c index 0987051e73..5fdd68bdd0 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1,30 +1,29 @@ /* BFD back-end for s-record objects. - Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001 - Free Software Foundation, Inc. + Copyright (C) 1990-2016 Free Software Foundation, Inc. Written by Steve Chamberlain 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 3 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., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ -/* -SUBSECTION + +/* SUBSECTION S-Record handling -DESCRIPTION + DESCRIPTION Ordinary S-Records cannot hold anything but addresses and data, so that's all that we implement. @@ -44,10 +43,10 @@ DESCRIPTION An s record looks like: -EXAMPLE + EXAMPLE S
-DESCRIPTION + DESCRIPTION Where o length is the number of bytes following upto the checksum. Note that @@ -72,10 +71,10 @@ DESCRIPTION is the sum of all the raw byte data in the record, from the length upwards, modulo 256 and subtracted from 255. -SUBSECTION + SUBSECTION Symbol S-Record handling -DESCRIPTION + DESCRIPTION Some ICE equipment understands an addition to the standard S-Record format; symbols and their addresses can be sent before the data. @@ -87,7 +86,7 @@ DESCRIPTION so a short symbol table could look like: -EXAMPLE + EXAMPLE $$ flash.x $$ flash.c _port6 $0 @@ -98,83 +97,36 @@ EXAMPLE _end $8036 $$ -DESCRIPTION + DESCRIPTION We allow symbols to be anywhere in the data stream - the module names - are always ignored. - -*/ + are always ignored. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" #include "libbfd.h" #include "libiberty.h" -#include - -static void srec_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *)); -static void srec_print_symbol - PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type)); -static void srec_init PARAMS ((void)); -static boolean srec_mkobject PARAMS ((bfd *)); -static int srec_get_byte PARAMS ((bfd *, boolean *)); -static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, boolean)); -static boolean srec_scan PARAMS ((bfd *)); -static const bfd_target *srec_object_p PARAMS ((bfd *)); -static const bfd_target *symbolsrec_object_p PARAMS ((bfd *)); -static boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *)); - -static boolean srec_write_record PARAMS ((bfd *, unsigned int, bfd_vma, - const bfd_byte *, - const bfd_byte *)); -static boolean srec_write_header PARAMS ((bfd *)); -static boolean srec_write_symbols PARAMS ((bfd *)); -static boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma)); -static boolean srec_get_section_contents - PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type)); -static boolean srec_set_arch_mach - PARAMS ((bfd *, enum bfd_architecture, unsigned long)); -static boolean srec_set_section_contents - PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type)); -static boolean internal_srec_write_object_contents PARAMS ((bfd *, int)); -static boolean srec_write_object_contents PARAMS ((bfd *)); -static boolean symbolsrec_write_object_contents PARAMS ((bfd *)); -static int srec_sizeof_headers PARAMS ((bfd *, boolean)); -static asymbol *srec_make_empty_symbol PARAMS ((bfd *)); -static long srec_get_symtab_upper_bound PARAMS ((bfd *)); -static long srec_get_symtab PARAMS ((bfd *, asymbol **)); +#include "safe-ctype.h" + /* Macros for converting between hex and binary. */ static const char digs[] = "0123456789ABCDEF"; -#define NIBBLE(x) hex_value(x) -#define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1])) +#define NIBBLE(x) hex_value(x) +#define HEX(buffer) ((NIBBLE ((buffer)[0])<<4) + NIBBLE ((buffer)[1])) #define TOHEX(d, x, ch) \ d[1] = digs[(x) & 0xf]; \ d[0] = digs[((x)>>4)&0xf]; \ ch += ((x) & 0xff); -#define ISHEX(x) hex_p(x) - -/* Initialize by filling in the hex conversion array. */ - -static void -srec_init () -{ - static boolean inited = false; +#define ISHEX(x) hex_p(x) - if (inited == false) - { - inited = true; - hex_init (); - } -} - -/* The maximum number of bytes on a line is FF. */ +/* The maximum number of address+data+crc bytes on a line is FF. */ #define MAXCHUNK 0xff /* Default size for a CHUNK. */ #define DEFAULT_CHUNK 16 -/* The number of bytes we actually fit onto a line on output. +/* The number of data bytes we actually fit onto a line on output. This variable can be modified by objcopy's --srec-len parameter. For a 0x75 byte record you should set --srec-len=0x70. */ unsigned int Chunk = DEFAULT_CHUNK; @@ -182,7 +134,7 @@ unsigned int Chunk = DEFAULT_CHUNK; /* The type of srec output (free or forced to S3). This variable can be modified by objcopy's --srec-forceS3 parameter. */ -boolean S3Forced = 0; +bfd_boolean S3Forced = FALSE; /* When writing an S-record file, the S-records can not be output as they are seen. This structure is used to hold them in memory. */ @@ -221,50 +173,56 @@ typedef struct srec_data_struct } tdata_type; -static boolean srec_write_section PARAMS ((bfd *, tdata_type *, - srec_data_list_type *)); -static boolean srec_write_terminator PARAMS ((bfd *, tdata_type *)); +/* Initialize by filling in the hex conversion array. */ + +static void +srec_init (void) +{ + static bfd_boolean inited = FALSE; + + if (! inited) + { + inited = TRUE; + hex_init (); + } +} /* Set up the S-record tdata information. */ -static boolean -srec_mkobject (abfd) - bfd *abfd; +static bfd_boolean +srec_mkobject (bfd *abfd) { + tdata_type *tdata; + srec_init (); - if (abfd->tdata.srec_data == NULL) - { - bfd_size_type amt = sizeof (tdata_type); - tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, amt); - if (tdata == NULL) - return false; - abfd->tdata.srec_data = tdata; - tdata->type = 1; - tdata->head = NULL; - tdata->tail = NULL; - tdata->symbols = NULL; - tdata->symtail = NULL; - tdata->csymbols = NULL; - } + tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type)); + if (tdata == NULL) + return FALSE; - return true; + abfd->tdata.srec_data = tdata; + tdata->type = 1; + tdata->head = NULL; + tdata->tail = NULL; + tdata->symbols = NULL; + tdata->symtail = NULL; + tdata->csymbols = NULL; + + return TRUE; } /* Read a byte from an S record file. Set *ERRORPTR if an error occurred. Return EOF on error or end of file. */ static int -srec_get_byte (abfd, errorptr) - bfd *abfd; - boolean *errorptr; +srec_get_byte (bfd *abfd, 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; } @@ -276,11 +234,10 @@ srec_get_byte (abfd, errorptr) error messages. */ static void -srec_bad_byte (abfd, lineno, c, error) - bfd *abfd; - unsigned int lineno; - int c; - boolean error; +srec_bad_byte (bfd *abfd, + unsigned int lineno, + int c, + bfd_boolean error) { if (c == EOF) { @@ -289,36 +246,32 @@ srec_bad_byte (abfd, lineno, c, error) } else { - char buf[10]; + char buf[40]; - if (! isprint (c)) - sprintf (buf, "\\%03o", (unsigned int) c); + if (! ISPRINT (c)) + sprintf (buf, "\\%03o", (unsigned int) c & 0xff); else { buf[0] = c; buf[1] = '\0'; } (*_bfd_error_handler) - (_("%s:%d: Unexpected character `%s' in S-record file\n"), - bfd_get_filename (abfd), lineno, buf); + (_("%B:%d: Unexpected character `%s' in S-record file\n"), + abfd, lineno, buf); bfd_set_error (bfd_error_bad_value); } } /* Add a new symbol found in an S-record file. */ -static boolean -srec_new_symbol (abfd, name, val) - bfd *abfd; - const char *name; - bfd_vma val; +static bfd_boolean +srec_new_symbol (bfd *abfd, const char *name, bfd_vma val) { struct srec_symbol *n; - bfd_size_type amt = sizeof (struct srec_symbol); - n = (struct srec_symbol *) bfd_alloc (abfd, amt); + n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (* n)); if (n == NULL) - return false; + return FALSE; n->name = name; n->val = val; @@ -332,19 +285,18 @@ srec_new_symbol (abfd, name, val) ++abfd->symcount; - return true; + return TRUE; } /* Read the S record file and turn it into sections. We create a new section for each contiguous set of bytes. */ -static boolean -srec_scan (abfd) - bfd *abfd; +static bfd_boolean +srec_scan (bfd *abfd) { int c; unsigned int lineno = 1; - boolean error = false; + bfd_boolean error = FALSE; bfd_byte *buf = NULL; size_t bufsize = 0; asection *sec = NULL; @@ -356,7 +308,7 @@ srec_scan (abfd) while ((c = srec_get_byte (abfd, &error)) != EOF) { /* We only build sections from contiguous S-records, so if this - is not an S-record, then stop building a section. */ + is not an S-record, then stop building a section. */ if (c != 'S' && c != '\r' && c != '\n') sec = NULL; @@ -385,7 +337,6 @@ srec_scan (abfd) } ++lineno; - break; case ' ': @@ -418,7 +369,7 @@ srec_scan (abfd) *p++ = c; while ((c = srec_get_byte (abfd, &error)) != EOF - && ! isspace (c)) + && ! ISSPACE (c)) { if ((bfd_size_type) (p - symbuf) >= alc) { @@ -442,7 +393,7 @@ srec_scan (abfd) } *p++ = '\0'; - symname = bfd_alloc (abfd, (bfd_size_type) (p - symbuf)); + symname = (char *) bfd_alloc (abfd, (bfd_size_type) (p - symbuf)); if (symname == NULL) goto error_return; strcpy (symname, symbuf); @@ -475,6 +426,11 @@ srec_scan (abfd) symval <<= 4; symval += NIBBLE (c); c = srec_get_byte (abfd, &error); + if (c == EOF) + { + srec_bad_byte (abfd, lineno, c, error); + goto error_return; + } } if (! srec_new_symbol (abfd, symname, symval)) @@ -496,10 +452,11 @@ srec_scan (abfd) case 'S': { file_ptr pos; - char hdr[3]; - unsigned int bytes; + unsigned char hdr[3]; + unsigned int bytes, min_bytes; bfd_vma address; bfd_byte *data; + unsigned char check_sum; /* Starting an S-record. */ @@ -518,7 +475,20 @@ srec_scan (abfd) goto error_return; } - bytes = HEX (hdr + 1); + check_sum = bytes = HEX (hdr + 1); + min_bytes = 3; + if (hdr[0] == '2' || hdr[0] == '8') + min_bytes = 4; + else if (hdr[0] == '3' || hdr[0] == '7') + min_bytes = 5; + if (bytes < min_bytes) + { + (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"), + abfd, lineno, bytes); + bfd_set_error (bfd_error_bad_value); + goto error_return; + } + if (bytes * 2 > bufsize) { if (buf != NULL) @@ -542,77 +512,112 @@ srec_scan (abfd) case '0': case '5': /* Prologue--ignore the file name, but stop building a - section at this point. */ + section at this point. */ sec = NULL; break; case '3': + check_sum += HEX (data); address = HEX (data); data += 2; --bytes; /* Fall through. */ case '2': + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; --bytes; /* Fall through. */ case '1': + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; bytes -= 2; if (sec != NULL - && sec->vma + sec->_raw_size == address) + && sec->vma + sec->size == address) { /* This data goes at the end of the section we are - currently building. */ - sec->_raw_size += bytes; + currently building. */ + sec->size += bytes; } else { char secbuf[20]; char *secname; bfd_size_type amt; + flagword flags; sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1); amt = strlen (secbuf) + 1; secname = (char *) bfd_alloc (abfd, amt); 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 = address; sec->lma = address; - sec->_raw_size = bytes; + sec->size = bytes; sec->filepos = pos; } + while (bytes > 0) + { + check_sum += HEX (data); + data += 2; + bytes--; + } + check_sum = 255 - (check_sum & 0xff); + if (check_sum != HEX (data)) + { + (*_bfd_error_handler) + (_("%B:%d: Bad checksum in S-record file\n"), + abfd, lineno); + bfd_set_error (bfd_error_bad_value); + goto error_return; + } + break; case '7': + check_sum += HEX (data); address = HEX (data); data += 2; /* Fall through. */ case '8': + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; /* Fall through. */ case '9': + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; + check_sum += HEX (data); address = (address << 8) | HEX (data); data += 2; /* This is a termination record. */ abfd->start_address = address; + check_sum = 255 - (check_sum & 0xff); + if (check_sum != HEX (data)) + { + (*_bfd_error_handler) + (_("%B:%d: Bad checksum in S-record file\n"), + abfd, lineno); + bfd_set_error (bfd_error_bad_value); + goto error_return; + } + if (buf != NULL) free (buf); - return true; + return TRUE; } } break; @@ -625,22 +630,22 @@ srec_scan (abfd) if (buf != NULL) free (buf); - return true; + return TRUE; error_return: if (symbuf != NULL) free (symbuf); if (buf != NULL) free (buf); - return false; + return FALSE; } /* Check whether an existing file is an S-record file. */ static const bfd_target * -srec_object_p (abfd) - bfd *abfd; +srec_object_p (bfd *abfd) { + void * tdata_save; bfd_byte b[4]; srec_init (); @@ -655,9 +660,14 @@ srec_object_p (abfd) return NULL; } - if (! srec_mkobject (abfd) - || ! srec_scan (abfd)) - return NULL; + tdata_save = abfd->tdata.any; + if (! srec_mkobject (abfd) || ! srec_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; + } if (abfd->symcount > 0) abfd->flags |= HAS_SYMS; @@ -668,9 +678,9 @@ srec_object_p (abfd) /* Check whether an existing file is an S-record file with symbols. */ static const bfd_target * -symbolsrec_object_p (abfd) - bfd *abfd; +symbolsrec_object_p (bfd *abfd) { + void * tdata_save; char b[2]; srec_init (); @@ -685,9 +695,14 @@ symbolsrec_object_p (abfd) return NULL; } - if (! srec_mkobject (abfd) - || ! srec_scan (abfd)) - return NULL; + tdata_save = abfd->tdata.any; + if (! srec_mkobject (abfd) || ! srec_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; + } if (abfd->symcount > 0) abfd->flags |= HAS_SYMS; @@ -697,15 +712,12 @@ symbolsrec_object_p (abfd) /* Read in the contents of a section in an S-record file. */ -static boolean -srec_read_section (abfd, section, contents) - bfd *abfd; - asection *section; - bfd_byte *contents; +static bfd_boolean +srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) { int c; bfd_size_type sofar = 0; - boolean error = false; + bfd_boolean error = FALSE; bfd_byte *buf = NULL; size_t bufsize = 0; @@ -723,7 +735,7 @@ srec_read_section (abfd, section, contents) continue; /* This is called after srec_scan has already been called, so we - ought to know the exact format. */ + ought to know the exact format. */ BFD_ASSERT (c == 'S'); if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3) @@ -751,10 +763,10 @@ srec_read_section (abfd, section, contents) switch (hdr[0]) { default: - BFD_ASSERT (sofar == section->_raw_size); + BFD_ASSERT (sofar == section->size); if (buf != NULL) free (buf); - return true; + return TRUE; case '3': address = HEX (data); @@ -776,10 +788,10 @@ srec_read_section (abfd, section, contents) if (address != section->vma + sofar) { /* We've come to the end of this section. */ - BFD_ASSERT (sofar == section->_raw_size); + BFD_ASSERT (sofar == section->size); if (buf != NULL) free (buf); - return true; + return TRUE; } /* Don't consider checksum. */ @@ -799,78 +811,83 @@ srec_read_section (abfd, section, contents) if (error) goto error_return; - BFD_ASSERT (sofar == section->_raw_size); + BFD_ASSERT (sofar == section->size); 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 S-record file. */ -static boolean -srec_get_section_contents (abfd, section, location, offset, count) - bfd *abfd; - asection *section; - PTR location; - file_ptr offset; - bfd_size_type count; +static bfd_boolean +srec_get_section_contents (bfd *abfd, + asection *section, + void * location, + file_ptr offset, + bfd_size_type count) { + if (count == 0) + return TRUE; + + if (offset + count < count + || offset + count > section->size) + { + bfd_set_error (bfd_error_invalid_operation); + return FALSE; + } + if (section->used_by_bfd == NULL) { - section->used_by_bfd = bfd_alloc (abfd, section->_raw_size); - if (section->used_by_bfd == NULL && section->_raw_size != 0) - return false; + section->used_by_bfd = bfd_alloc (abfd, section->size); + if (section->used_by_bfd == NULL) + return FALSE; - if (! srec_read_section (abfd, section, section->used_by_bfd)) - return false; + if (! srec_read_section (abfd, section, + (bfd_byte *) section->used_by_bfd)) + return FALSE; } memcpy (location, (bfd_byte *) section->used_by_bfd + offset, (size_t) count); - return true; + return TRUE; } /* Set the architecture. We accept an unknown architecture here. */ -static boolean -srec_set_arch_mach (abfd, arch, mach) - bfd *abfd; - enum bfd_architecture arch; - unsigned long mach; +static bfd_boolean +srec_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach) { - if (arch == bfd_arch_unknown) - { - abfd->arch_info = &bfd_default_arch_struct; - return true; - } - return bfd_default_set_arch_mach (abfd, arch, mach); + if (arch != bfd_arch_unknown) + return bfd_default_set_arch_mach (abfd, arch, mach); + + abfd->arch_info = & bfd_default_arch_struct; + return TRUE; } /* We have to save up all the Srecords for a splurge before output. */ -static boolean -srec_set_section_contents (abfd, section, location, offset, bytes_to_do) - bfd *abfd; - sec_ptr section; - PTR location; - file_ptr offset; - bfd_size_type bytes_to_do; +static bfd_boolean +srec_set_section_contents (bfd *abfd, + sec_ptr section, + const void * location, + file_ptr offset, + bfd_size_type bytes_to_do) { + int opb = bfd_octets_per_byte (abfd); tdata_type *tdata = abfd->tdata.srec_data; - register srec_data_list_type *entry; + srec_data_list_type *entry; - entry = ((srec_data_list_type *) - bfd_alloc (abfd, (bfd_size_type) sizeof (srec_data_list_type))); + entry = (srec_data_list_type *) bfd_alloc (abfd, sizeof (* entry)); if (entry == NULL) - return false; + return FALSE; if (bytes_to_do && (section->flags & SEC_ALLOC) @@ -880,27 +897,27 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do) data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do); if (data == NULL) - return false; - memcpy ((PTR) data, location, (size_t) bytes_to_do); + return FALSE; + memcpy ((void *) data, location, (size_t) bytes_to_do); - /* Ff S3Forced is true then always select S3 records, + /* Ff S3Forced is TRUE then always select S3 records, regardless of the siez of the addresses. */ if (S3Forced) tdata->type = 3; - else if ((section->lma + offset + bytes_to_do - 1) <= 0xffff) + else if ((section->lma + (offset + bytes_to_do) / opb - 1) <= 0xffff) ; /* The default, S1, is OK. */ - else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff + else if ((section->lma + (offset + bytes_to_do) / opb - 1) <= 0xffffff && tdata->type <= 2) tdata->type = 2; else tdata->type = 3; entry->data = data; - entry->where = section->lma + offset; + entry->where = section->lma + offset / opb; entry->size = bytes_to_do; /* Sort the records by address. Optimize for the common case of - adding a record to the end of the list. */ + adding a record to the end of the list. */ if (tdata->tail != NULL && entry->where >= tdata->tail->where) { @@ -910,7 +927,7 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do) } else { - register srec_data_list_type **look; + srec_data_list_type **look; for (look = &tdata->head; *look != NULL && (*look)->where < entry->where; @@ -922,22 +939,21 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do) tdata->tail = entry; } } - return true; + return TRUE; } /* Write a record of type, of the supplied number of bytes. The supplied bytes and length don't have a checksum. That's worked out here. */ -static boolean -srec_write_record (abfd, type, address, data, end) - bfd *abfd; - unsigned int type; - bfd_vma address; - const bfd_byte *data; - const bfd_byte *end; +static bfd_boolean +srec_write_record (bfd *abfd, + unsigned int type, + bfd_vma address, + const bfd_byte *data, + const bfd_byte *end) { - char buffer[MAXCHUNK]; + char buffer[2 * MAXCHUNK + 6]; unsigned int check_sum = 0; const bfd_byte *src = data; char *dst = buffer; @@ -986,35 +1002,43 @@ srec_write_record (abfd, type, address, data, end) *dst++ = '\r'; *dst++ = '\n'; wrlen = dst - buffer; - if (bfd_bwrite ((PTR) buffer, wrlen, abfd) != wrlen) - return false; - return true; + + return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen; } -static boolean -srec_write_header (abfd) - bfd *abfd; +static bfd_boolean +srec_write_header (bfd *abfd) { - bfd_byte buffer[MAXCHUNK]; - bfd_byte *dst = buffer; - unsigned int i; + unsigned int len = strlen (abfd->filename); - /* I'll put an arbitary 40 char limit on header size. */ - for (i = 0; i < 40 && abfd->filename[i]; i++) - *dst++ = abfd->filename[i]; + /* I'll put an arbitrary 40 char limit on header size. */ + if (len > 40) + len = 40; - return srec_write_record (abfd, 0, (bfd_vma) 0, buffer, dst); + return srec_write_record (abfd, 0, (bfd_vma) 0, + (bfd_byte *) abfd->filename, + (bfd_byte *) abfd->filename + len); } -static boolean -srec_write_section (abfd, tdata, list) - bfd *abfd; - tdata_type *tdata; - srec_data_list_type *list; +static bfd_boolean +srec_write_section (bfd *abfd, + tdata_type *tdata, + srec_data_list_type *list) { unsigned int octets_written = 0; bfd_byte *location = list->data; + /* Validate number of data bytes to write. The srec length byte + counts the address, data and crc bytes. S1 (tdata->type == 1) + records have two address bytes, S2 (tdata->type == 2) records + have three, and S3 (tdata->type == 3) records have four. + The total length can't exceed 255, and a zero data length will + spin for a long time. */ + if (Chunk == 0) + Chunk = 1; + else if (Chunk > MAXCHUNK - tdata->type - 2) + Chunk = MAXCHUNK - tdata->type - 2; + while (octets_written < list->size) { bfd_vma address; @@ -1030,31 +1054,25 @@ srec_write_section (abfd, tdata, list) address, location, location + octets_this_chunk)) - return false; + return FALSE; octets_written += octets_this_chunk; location += octets_this_chunk; } - return true; + return TRUE; } -static boolean -srec_write_terminator (abfd, tdata) - bfd *abfd; - tdata_type *tdata; +static bfd_boolean +srec_write_terminator (bfd *abfd, tdata_type *tdata) { - bfd_byte buffer[2]; - return srec_write_record (abfd, 10 - tdata->type, - abfd->start_address, buffer, buffer); + abfd->start_address, NULL, NULL); } -static boolean -srec_write_symbols (abfd) - bfd *abfd; +static bfd_boolean +srec_write_symbols (bfd *abfd) { - char buffer[MAXCHUNK]; /* Dump out the symbols of a bfd. */ int i; int count = bfd_get_symcount (abfd); @@ -1063,11 +1081,12 @@ srec_write_symbols (abfd) { bfd_size_type len; asymbol **table = bfd_get_outsymbols (abfd); - sprintf (buffer, "$$ %s\r\n", abfd->filename); - len = strlen (buffer); - if (bfd_bwrite (buffer, len, abfd) != len) - return false; + len = strlen (abfd->filename); + if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3 + || bfd_bwrite (abfd->filename, len, abfd) != len + || bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2) + return FALSE; for (i = 0; i < count; i++) { @@ -1076,33 +1095,38 @@ srec_write_symbols (abfd) && (s->flags & BSF_DEBUGGING) == 0) { /* Just dump out non debug symbols. */ - char buf2[40], *p; + char buf[43], *p; + + len = strlen (s->name); + if (bfd_bwrite (" ", (bfd_size_type) 2, abfd) != 2 + || bfd_bwrite (s->name, len, abfd) != len) + return FALSE; - sprintf_vma (buf2, - s->value + s->section->output_section->lma - + s->section->output_offset); - p = buf2; + sprintf_vma (buf + 2, (s->value + + s->section->output_section->lma + + s->section->output_offset)); + p = buf + 2; while (p[0] == '0' && p[1] != 0) p++; - sprintf (buffer, " %s $%s\r\n", s->name, p); - len = strlen (buffer); - if (bfd_bwrite (buffer, len, abfd) != len) - return false; + len = strlen (p); + p[len] = '\r'; + p[len + 1] = '\n'; + *--p = '$'; + *--p = ' '; + len += 4; + if (bfd_bwrite (p, len, abfd) != len) + return FALSE; } } - sprintf (buffer, "$$ \r\n"); - len = strlen (buffer); - if (bfd_bwrite (buffer, len, abfd) != len) - return false; + if (bfd_bwrite ("$$ \r\n", (bfd_size_type) 5, abfd) != 5) + return FALSE; } - return true; + return TRUE; } -static boolean -internal_srec_write_object_contents (abfd, symbols) - bfd *abfd; - int symbols; +static bfd_boolean +internal_srec_write_object_contents (bfd *abfd, int symbols) { tdata_type *tdata = abfd->tdata.srec_data; srec_data_list_type *list; @@ -1110,11 +1134,11 @@ internal_srec_write_object_contents (abfd, symbols) if (symbols) { if (! srec_write_symbols (abfd)) - return false; + return FALSE; } if (! srec_write_header (abfd)) - return false; + return FALSE; /* Now wander though all the sections provided and output them. */ list = tdata->head; @@ -1122,51 +1146,35 @@ internal_srec_write_object_contents (abfd, symbols) while (list != (srec_data_list_type *) NULL) { if (! srec_write_section (abfd, tdata, list)) - return false; + return FALSE; list = list->next; } return srec_write_terminator (abfd, tdata); } -static boolean -srec_write_object_contents (abfd) - bfd *abfd; +static bfd_boolean +srec_write_object_contents (bfd *abfd) { return internal_srec_write_object_contents (abfd, 0); } -static boolean -symbolsrec_write_object_contents (abfd) - bfd *abfd; +static bfd_boolean +symbolsrec_write_object_contents (bfd *abfd) { return internal_srec_write_object_contents (abfd, 1); } static int -srec_sizeof_headers (abfd, exec) - bfd *abfd ATTRIBUTE_UNUSED; - boolean exec ATTRIBUTE_UNUSED; +srec_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info ATTRIBUTE_UNUSED) { return 0; } -static asymbol * -srec_make_empty_symbol (abfd) - bfd *abfd; -{ - asymbol *new; - - new = (asymbol *) bfd_zalloc (abfd, (bfd_size_type) sizeof (asymbol)); - if (new) - new->the_bfd = abfd; - return new; -} - /* Return the amount of memory needed to read the symbol table. */ static long -srec_get_symtab_upper_bound (abfd) - bfd *abfd; +srec_get_symtab_upper_bound (bfd *abfd) { return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *); } @@ -1174,23 +1182,21 @@ srec_get_symtab_upper_bound (abfd) /* Return the symbol table. */ static long -srec_get_symtab (abfd, alocation) - bfd *abfd; - asymbol **alocation; +srec_canonicalize_symtab (bfd *abfd, asymbol **alocation) { bfd_size_type symcount = bfd_get_symcount (abfd); asymbol *csymbols; unsigned int i; csymbols = abfd->tdata.srec_data->csymbols; - if (csymbols == NULL) + if (csymbols == NULL && symcount != 0) { asymbol *c; struct srec_symbol *s; csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol)); - if (csymbols == NULL && symcount != 0) - return false; + if (csymbols == NULL) + return -1; abfd->tdata.srec_data->csymbols = csymbols; for (s = abfd->tdata.srec_data->symbols, c = csymbols; @@ -1214,90 +1220,91 @@ srec_get_symtab (abfd, alocation) } static void -srec_get_symbol_info (ignore_abfd, symbol, ret) - bfd *ignore_abfd ATTRIBUTE_UNUSED; - asymbol *symbol; - symbol_info *ret; +srec_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED, + asymbol *symbol, + symbol_info *ret) { bfd_symbol_info (symbol, ret); } static void -srec_print_symbol (abfd, afile, symbol, how) - bfd *abfd; - PTR afile; - asymbol *symbol; - bfd_print_symbol_type how; +srec_print_symbol (bfd *abfd, + void * afile, + asymbol *symbol, + bfd_print_symbol_type how) { FILE *file = (FILE *) afile; + switch (how) { case bfd_print_symbol_name: fprintf (file, "%s", symbol->name); break; default: - bfd_print_symbol_vandf (abfd, (PTR) file, symbol); + bfd_print_symbol_vandf (abfd, (void *) file, symbol); fprintf (file, " %-5s %s", symbol->section->name, symbol->name); - } } -#define srec_close_and_cleanup _bfd_generic_close_and_cleanup -#define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info -#define srec_new_section_hook _bfd_generic_new_section_hook - -#define srec_bfd_is_local_label_name bfd_generic_is_local_label_name -#define srec_get_lineno _bfd_nosymbols_get_lineno -#define srec_find_nearest_line _bfd_nosymbols_find_nearest_line -#define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol -#define srec_read_minisymbols _bfd_generic_read_minisymbols -#define srec_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol - -#define srec_get_reloc_upper_bound \ - ((long (*) PARAMS ((bfd *, asection *))) bfd_0l) -#define srec_canonicalize_reloc \ - ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l) -#define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup - -#define srec_get_section_contents_in_window \ - _bfd_generic_get_section_contents_in_window - -#define srec_bfd_get_relocated_section_contents \ - bfd_generic_get_relocated_section_contents -#define srec_bfd_relax_section bfd_generic_relax_section -#define srec_bfd_gc_sections bfd_generic_gc_sections -#define srec_bfd_merge_sections bfd_generic_merge_sections -#define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create -#define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols -#define srec_bfd_final_link _bfd_generic_final_link -#define srec_bfd_link_split_section _bfd_generic_link_split_section +#define srec_close_and_cleanup _bfd_generic_close_and_cleanup +#define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info +#define srec_new_section_hook _bfd_generic_new_section_hook +#define srec_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false) +#define srec_bfd_is_local_label_name bfd_generic_is_local_label_name +#define srec_get_lineno _bfd_nosymbols_get_lineno +#define srec_find_nearest_line _bfd_nosymbols_find_nearest_line +#define srec_find_line _bfd_nosymbols_find_line +#define srec_find_inliner_info _bfd_nosymbols_find_inliner_info +#define srec_make_empty_symbol _bfd_generic_make_empty_symbol +#define srec_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string +#define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol +#define srec_read_minisymbols _bfd_generic_read_minisymbols +#define srec_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol +#define srec_get_section_contents_in_window _bfd_generic_get_section_contents_in_window +#define srec_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents +#define srec_bfd_relax_section bfd_generic_relax_section +#define srec_bfd_gc_sections bfd_generic_gc_sections +#define srec_bfd_lookup_section_flags bfd_generic_lookup_section_flags +#define srec_bfd_merge_sections bfd_generic_merge_sections +#define srec_bfd_is_group_section bfd_generic_is_group_section +#define srec_bfd_discard_group bfd_generic_discard_group +#define srec_section_already_linked _bfd_generic_section_already_linked +#define srec_bfd_define_common_symbol bfd_generic_define_common_symbol +#define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create +#define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols +#define srec_bfd_link_just_syms _bfd_generic_link_just_syms +#define srec_bfd_copy_link_hash_symbol_type _bfd_generic_copy_link_hash_symbol_type +#define srec_bfd_final_link _bfd_generic_final_link +#define srec_bfd_link_split_section _bfd_generic_link_split_section +#define srec_bfd_link_check_relocs _bfd_generic_link_check_relocs const bfd_target srec_vec = { - "srec", /* name */ + "srec", /* Name. */ bfd_target_srec_flavour, - BFD_ENDIAN_UNKNOWN, /* target byte order */ - BFD_ENDIAN_UNKNOWN, /* target headers byte order */ - (HAS_RELOC | EXEC_P | /* object flags */ + BFD_ENDIAN_UNKNOWN, /* Target byte order. */ + BFD_ENDIAN_UNKNOWN, /* Target headers byte order. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS - | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ + | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* 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, /* Hdrs. */ { _bfd_dummy_target, - srec_object_p, /* bfd_check_format */ + srec_object_p, /* bfd_check_format. */ _bfd_dummy_target, _bfd_dummy_target, }, @@ -1307,7 +1314,7 @@ const bfd_target srec_vec = _bfd_generic_mkarchive, bfd_false, }, - { /* bfd_write_contents */ + { /* bfd_write_contents. */ bfd_false, srec_write_object_contents, _bfd_write_archive_contents, @@ -1319,40 +1326,41 @@ const bfd_target srec_vec = BFD_JUMP_TABLE_CORE (_bfd_nocore), BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), BFD_JUMP_TABLE_SYMBOLS (srec), - BFD_JUMP_TABLE_RELOCS (srec), + BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), BFD_JUMP_TABLE_WRITE (srec), BFD_JUMP_TABLE_LINK (srec), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), NULL, - (PTR) 0 + NULL }; const bfd_target symbolsrec_vec = { - "symbolsrec", /* name */ + "symbolsrec", /* Name. */ bfd_target_srec_flavour, - BFD_ENDIAN_UNKNOWN, /* target byte order */ - BFD_ENDIAN_UNKNOWN, /* target headers byte order */ - (HAS_RELOC | EXEC_P | /* object flags */ + BFD_ENDIAN_UNKNOWN, /* Target byte order. */ + BFD_ENDIAN_UNKNOWN, /* Target headers byte order. */ + (HAS_RELOC | EXEC_P | /* Object flags. */ HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED), (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS - | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */ - 0, /* leading underscore */ - ' ', /* ar_pad_char */ - 16, /* ar_max_namelen */ + | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* 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, - symbolsrec_object_p, /* bfd_check_format */ + symbolsrec_object_p, /* bfd_check_format. */ _bfd_dummy_target, _bfd_dummy_target, }, @@ -1362,7 +1370,7 @@ const bfd_target symbolsrec_vec = _bfd_generic_mkarchive, bfd_false, }, - { /* bfd_write_contents */ + { /* bfd_write_contents. */ bfd_false, symbolsrec_write_object_contents, _bfd_write_archive_contents, @@ -1374,12 +1382,12 @@ const bfd_target symbolsrec_vec = BFD_JUMP_TABLE_CORE (_bfd_nocore), BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive), BFD_JUMP_TABLE_SYMBOLS (srec), - BFD_JUMP_TABLE_RELOCS (srec), + BFD_JUMP_TABLE_RELOCS (_bfd_norelocs), BFD_JUMP_TABLE_WRITE (srec), BFD_JUMP_TABLE_LINK (srec), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), NULL, - (PTR) 0 + NULL };