X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fsrec.c;h=521717ca463401c86d70a2fd935e9d8c20659390;hb=c4dfa77f430fbd0eb5ec1d22c2b29581091ab0fe;hp=8370c0ef98a290070ed91b6fd57e5f8b0ff7e40f;hpb=fa803dc60f0bf01297674c41d001798e18ade4dc;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/srec.c b/bfd/srec.c index 8370c0ef98..521717ca46 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1,5 +1,6 @@ /* BFD back-end for s-record objects. - Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc. + Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 + Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support . This file is part of BFD, the Binary File Descriptor library. @@ -109,6 +110,7 @@ DESCRIPTION #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)); @@ -140,7 +142,7 @@ 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 **)); -/* Macros for converting between hex and binary. */ +/* Macros for converting between hex and binary. */ static CONST char digs[] = "0123456789ABCDEF"; @@ -152,7 +154,7 @@ static CONST char digs[] = "0123456789ABCDEF"; ch += ((x) & 0xff); #define ISHEX(x) hex_p(x) -/* Initialize by filling in the hex conversion array. */ +/* Initialize by filling in the hex conversion array. */ static void srec_init () @@ -166,10 +168,21 @@ srec_init () } } -/* The maximum number of bytes on a line is FF */ +/* The maximum number of bytes on a line is FF. */ #define MAXCHUNK 0xff -/* The number of bytes we fit onto a line on output */ -#define CHUNK 21 + +/* Default size for a CHUNK. */ +#define DEFAULT_CHUNK 16 + +/* The number of 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; + +/* The type of srec output (free or forced to S3). + This variable can be modified by objcopy's --srec-forceS3 + parameter. */ +boolean S3Forced = 0; /* 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. */ @@ -285,7 +298,7 @@ srec_bad_byte (abfd, lineno, c, error) buf[1] = '\0'; } (*_bfd_error_handler) - ("%s:%d: Unexpected character `%s' in S-record file\n", + (_("%s:%d: Unexpected character `%s' in S-record file\n"), bfd_get_filename (abfd), lineno, buf); bfd_set_error (bfd_error_bad_value); } @@ -385,7 +398,7 @@ srec_scan (abfd) && (c == ' ' || c == '\t')) ; - if (c == '\n') + if (c == '\n' || c == '\r') break; if (c == EOF) @@ -405,7 +418,7 @@ srec_scan (abfd) while ((c = srec_get_byte (abfd, &error)) != EOF && ! isspace (c)) { - if (p - symbuf >= alc) + if ((unsigned int) (p - symbuf) >= alc) { char *n; @@ -465,18 +478,19 @@ srec_scan (abfd) if (! srec_new_symbol (abfd, symname, symval)) goto error_return; } - while (c == ' ' || c == '\t'); + while (c == ' ' || c == '\t') + ; - if (c != '\n') + if (c == '\n') + ++lineno; + else if (c != '\r') { srec_bad_byte (abfd, lineno, c, error); goto error_return; } - ++lineno; - break; - + case 'S': { file_ptr pos; @@ -641,6 +655,9 @@ srec_object_p (abfd) || ! srec_scan (abfd)) return NULL; + if (abfd->symcount > 0) + abfd->flags |= HAS_SYMS; + return abfd->xvec; } @@ -668,6 +685,9 @@ symbolsrec_object_p (abfd) || ! srec_scan (abfd)) return NULL; + if (abfd->symcount > 0) + abfd->flags |= HAS_SYMS; + return abfd->xvec; } @@ -831,7 +851,7 @@ srec_set_arch_mach (abfd, arch, mach) return bfd_default_set_arch_mach (abfd, arch, mach); } -/* we have to save up all the Srecords for a splurge before output */ +/* 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) @@ -858,19 +878,17 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do) return false; memcpy ((PTR) data, location, (size_t) bytes_to_do); - if ((section->lma + offset + bytes_to_do - 1) <= 0xffff) - { - - } + /* 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) + ; /* The default, S1, is OK. */ else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff - && tdata->type < 2) - { - tdata->type = 2; - } + && tdata->type <= 2) + tdata->type = 2; else - { - tdata->type = 3; - } + tdata->type = 3; entry->data = data; entry->where = section->lma + offset; @@ -904,8 +922,8 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do) /* 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 -*/ + here. */ + static boolean srec_write_record (abfd, type, address, data, end) bfd *abfd; @@ -925,7 +943,7 @@ srec_write_record (abfd, type, address, data, end) *dst++ = '0' + type; length = dst; - dst += 2; /* leave room for dst*/ + dst += 2; /* Leave room for dst. */ switch (type) { @@ -953,7 +971,7 @@ srec_write_record (abfd, type, address, data, end) dst += 2; } - /* Fill in the length */ + /* Fill in the length. */ TOHEX (length, (dst - length) / 2, check_sum); check_sum &= 0xff; check_sum = 255 - check_sum; @@ -968,8 +986,6 @@ srec_write_record (abfd, type, address, data, end) return true; } - - static boolean srec_write_header (abfd) bfd *abfd; @@ -978,11 +994,10 @@ srec_write_header (abfd) bfd_byte *dst = buffer; unsigned int i; - /* I'll put an arbitary 40 char limit on header size */ + /* I'll put an arbitary 40 char limit on header size. */ for (i = 0; i < 40 && abfd->filename[i]; i++) - { - *dst++ = abfd->filename[i]; - } + *dst++ = abfd->filename[i]; + return srec_write_record (abfd, 0, 0, buffer, dst); } @@ -992,31 +1007,28 @@ srec_write_section (abfd, tdata, list) tdata_type *tdata; srec_data_list_type *list; { - unsigned int bytes_written = 0; + unsigned int octets_written = 0; bfd_byte *location = list->data; - while (bytes_written < list->size) + while (octets_written < list->size) { bfd_vma address; + unsigned int octets_this_chunk = list->size - octets_written; - unsigned int bytes_this_chunk = list->size - bytes_written; - - if (bytes_this_chunk > CHUNK) - { - bytes_this_chunk = CHUNK; - } + if (octets_this_chunk > Chunk) + octets_this_chunk = Chunk; - address = list->where + bytes_written; + address = list->where + octets_written / bfd_octets_per_byte (abfd); if (! srec_write_record (abfd, tdata->type, address, location, - location + bytes_this_chunk)) + location + octets_this_chunk)) return false; - bytes_written += bytes_this_chunk; - location += bytes_this_chunk; + octets_written += octets_this_chunk; + location += octets_this_chunk; } return true; @@ -1033,14 +1045,12 @@ srec_write_terminator (abfd, tdata) abfd->start_address, buffer, buffer); } - - static boolean srec_write_symbols (abfd) bfd *abfd; { char buffer[MAXCHUNK]; - /* Dump out the symbols of a bfd */ + /* Dump out the symbols of a bfd. */ int i; int count = bfd_get_symcount (abfd); @@ -1057,28 +1067,10 @@ srec_write_symbols (abfd) for (i = 0; i < count; i++) { asymbol *s = table[i]; -#if 0 - int len = strlen (s->name); - - /* If this symbol has a .[ocs] in it, it's probably a file name - and we'll output that as the module name */ - - if (len > 3 && s->name[len - 2] == '.') + if (! bfd_is_local_label (abfd, s) + && (s->flags & BSF_DEBUGGING) == 0) { - int l; - sprintf (buffer, "$$ %s\r\n", s->name); - l = strlen (buffer); - if (bfd_write (buffer, l, 1, abfd) != l) - return false; - } - else -#endif - if (s->flags & (BSF_GLOBAL | BSF_LOCAL) - && (s->flags & BSF_DEBUGGING) == 0 - && s->name[0] != '.' - && s->name[0] != 't') - { - /* Just dump out non debug symbols */ + /* Just dump out non debug symbols. */ bfd_size_type l; char buf2[40], *p; @@ -1120,7 +1112,7 @@ internal_srec_write_object_contents (abfd, symbols) if (! srec_write_header (abfd)) return false; - /* Now wander though all the sections provided and output them */ + /* Now wander though all the sections provided and output them. */ list = tdata->head; while (list != (srec_data_list_type *) NULL) @@ -1146,11 +1138,10 @@ symbolsrec_write_object_contents (abfd) return internal_srec_write_object_contents (abfd, 1); } -/*ARGSUSED*/ static int srec_sizeof_headers (abfd, exec) - bfd *abfd; - boolean exec; + bfd *abfd ATTRIBUTE_UNUSED; + boolean exec ATTRIBUTE_UNUSED; { return 0; } @@ -1208,7 +1199,7 @@ srec_get_symtab (abfd, alocation) c->udata.p = NULL; } } - + for (i = 0; i < symcount; i++) *alocation++ = csymbols++; *alocation = NULL; @@ -1216,20 +1207,18 @@ srec_get_symtab (abfd, alocation) return symcount; } -/*ARGSUSED*/ -void +static void srec_get_symbol_info (ignore_abfd, symbol, ret) - bfd *ignore_abfd; + bfd *ignore_abfd ATTRIBUTE_UNUSED; asymbol *symbol; symbol_info *ret; { bfd_symbol_info (symbol, ret); } -/*ARGSUSED*/ static void srec_print_symbol (ignore_abfd, afile, symbol, how) - bfd *ignore_abfd; + bfd *ignore_abfd ATTRIBUTE_UNUSED; PTR afile; asymbol *symbol; bfd_print_symbol_type how; @@ -1272,6 +1261,7 @@ srec_print_symbol (ignore_abfd, afile, symbol, how) #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_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 @@ -1327,11 +1317,11 @@ const bfd_target srec_vec = BFD_JUMP_TABLE_LINK (srec), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + NULL, + (PTR) 0 }; - - const bfd_target symbolsrec_vec = { "symbolsrec", /* name */ @@ -1382,5 +1372,7 @@ const bfd_target symbolsrec_vec = BFD_JUMP_TABLE_LINK (srec), BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic), + NULL, + (PTR) 0 };