X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fsrec.c;h=ef7eb43995902693aaf410373e327da178973b6b;hb=bb6e246742f8795aacfbea2401e505e97c079ffa;hp=8de6e425cb8ad4d86bad4bd83bdaa0a9e203d5ee;hpb=60bb06bc89858ee50ad02907a833565dcc317182;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/srec.c b/bfd/srec.c index 8de6e425cb..ef7eb43995 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1,5 +1,5 @@ /* BFD back-end for s-record objects. - Copyright (C) 1990-2014 Free Software Foundation, Inc. + Copyright (C) 1990-2020 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support . This file is part of BFD, the Binary File Descriptor library. @@ -94,7 +94,7 @@ _start $14 _etext $8036 _edata $8036 - _end $8036 + _end $8036 $$ DESCRIPTION @@ -129,12 +129,12 @@ static const char digs[] = "0123456789ABCDEF"; /* 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; +unsigned int _bfd_srec_len = DEFAULT_CHUNK; /* The type of srec output (free or forced to S3). This variable can be modified by objcopy's --srec-forceS3 parameter. */ -bfd_boolean S3Forced = FALSE; +bfd_boolean _bfd_srec_forceS3 = 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. */ @@ -249,14 +249,15 @@ srec_bad_byte (bfd *abfd, char buf[40]; 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) - (_("%B:%d: Unexpected character `%s' in S-record file\n"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB:%d: unexpected character `%s' in S-record file"), abfd, lineno, buf); bfd_set_error (bfd_error_bad_value); } @@ -483,16 +484,16 @@ srec_scan (bfd *abfd) min_bytes = 5; if (bytes < min_bytes) { - (*_bfd_error_handler) (_("%B:%d: byte count %d too small\n"), - abfd, lineno, bytes); + /* xgettext:c-format */ + _bfd_error_handler (_("%pB:%d: byte count %d too small"), + abfd, lineno, bytes); bfd_set_error (bfd_error_bad_value); goto error_return; } if (bytes * 2 > bufsize) { - if (buf != NULL) - free (buf); + free (buf); buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2); if (buf == NULL) goto error_return; @@ -548,7 +549,7 @@ srec_scan (bfd *abfd) { char secbuf[20]; char *secname; - bfd_size_type amt; + size_t amt; flagword flags; sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1); @@ -574,8 +575,9 @@ srec_scan (bfd *abfd) check_sum = 255 - (check_sum & 0xff); if (check_sum != HEX (data)) { - (*_bfd_error_handler) - (_("%B:%d: Bad checksum in S-record file\n"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB:%d: bad checksum in S-record file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; @@ -607,16 +609,15 @@ srec_scan (bfd *abfd) check_sum = 255 - (check_sum & 0xff); if (check_sum != HEX (data)) { - (*_bfd_error_handler) - (_("%B:%d: Bad checksum in S-record file\n"), + _bfd_error_handler + /* xgettext:c-format */ + (_("%pB:%d: bad checksum in S-record file"), abfd, lineno); bfd_set_error (bfd_error_bad_value); goto error_return; } - if (buf != NULL) - free (buf); - + free (buf); return TRUE; } } @@ -627,22 +628,18 @@ srec_scan (bfd *abfd) if (error) goto error_return; - if (buf != NULL) - free (buf); - + free (buf); return TRUE; error_return: - if (symbuf != NULL) - free (symbuf); - if (buf != NULL) - free (buf); + free (symbuf); + free (buf); return FALSE; } /* Check whether an existing file is an S-record file. */ -static const bfd_target * +static bfd_cleanup srec_object_p (bfd *abfd) { void * tdata_save; @@ -672,12 +669,12 @@ srec_object_p (bfd *abfd) if (abfd->symcount > 0) abfd->flags |= HAS_SYMS; - return abfd->xvec; + return _bfd_no_cleanup; } /* Check whether an existing file is an S-record file with symbols. */ -static const bfd_target * +static bfd_cleanup symbolsrec_object_p (bfd *abfd) { void * tdata_save; @@ -707,7 +704,7 @@ symbolsrec_object_p (bfd *abfd) if (abfd->symcount > 0) abfd->flags |= HAS_SYMS; - return abfd->xvec; + return _bfd_no_cleanup; } /* Read in the contents of a section in an S-record file. */ @@ -747,8 +744,7 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) if (bytes * 2 > bufsize) { - if (buf != NULL) - free (buf); + free (buf); buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2); if (buf == NULL) goto error_return; @@ -764,8 +760,7 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) { default: BFD_ASSERT (sofar == section->size); - if (buf != NULL) - free (buf); + free (buf); return TRUE; case '3': @@ -789,8 +784,7 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) { /* We've come to the end of this section. */ BFD_ASSERT (sofar == section->size); - if (buf != NULL) - free (buf); + free (buf); return TRUE; } @@ -813,14 +807,11 @@ srec_read_section (bfd *abfd, asection *section, bfd_byte *contents) BFD_ASSERT (sofar == section->size); - if (buf != NULL) - free (buf); - + free (buf); return TRUE; error_return: - if (buf != NULL) - free (buf); + free (buf); return FALSE; } @@ -850,7 +841,7 @@ srec_get_section_contents (bfd *abfd, return FALSE; if (! srec_read_section (abfd, section, - (bfd_byte *) section->used_by_bfd)) + (bfd_byte *) section->used_by_bfd)) return FALSE; } @@ -881,7 +872,7 @@ srec_set_section_contents (bfd *abfd, file_ptr offset, bfd_size_type bytes_to_do) { - int opb = bfd_octets_per_byte (abfd); + int opb = bfd_octets_per_byte (abfd, NULL); tdata_type *tdata = abfd->tdata.srec_data; srec_data_list_type *entry; @@ -900,9 +891,9 @@ srec_set_section_contents (bfd *abfd, return FALSE; memcpy ((void *) data, location, (size_t) bytes_to_do); - /* Ff S3Forced is TRUE then always select S3 records, - regardless of the siez of the addresses. */ - if (S3Forced) + /* If _bfd_srec_forceS3 is TRUE then always select S3 records, + regardless of the size of the addresses. */ + if (_bfd_srec_forceS3) tdata->type = 3; else if ((section->lma + (offset + bytes_to_do) / opb - 1) <= 0xffff) ; /* The default, S1, is OK. */ @@ -972,10 +963,12 @@ srec_write_record (bfd *abfd, case 7: TOHEX (dst, (address >> 24), check_sum); dst += 2; + /* Fall through. */ case 8: case 2: TOHEX (dst, (address >> 16), check_sum); dst += 2; + /* Fall through. */ case 9: case 1: case 0: @@ -1009,15 +1002,15 @@ srec_write_record (bfd *abfd, static bfd_boolean srec_write_header (bfd *abfd) { - unsigned int len = strlen (abfd->filename); + unsigned int len = strlen (bfd_get_filename (abfd)); /* 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, - (bfd_byte *) abfd->filename, - (bfd_byte *) abfd->filename + len); + (bfd_byte *) bfd_get_filename (abfd), + (bfd_byte *) bfd_get_filename (abfd) + len); } static bfd_boolean @@ -1034,20 +1027,21 @@ srec_write_section (bfd *abfd, 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; + if (_bfd_srec_len == 0) + _bfd_srec_len = 1; + else if (_bfd_srec_len > MAXCHUNK - tdata->type - 2) + _bfd_srec_len = MAXCHUNK - tdata->type - 2; while (octets_written < list->size) { bfd_vma address; unsigned int octets_this_chunk = list->size - octets_written; - if (octets_this_chunk > Chunk) - octets_this_chunk = Chunk; + if (octets_this_chunk > _bfd_srec_len) + octets_this_chunk = _bfd_srec_len; - address = list->where + octets_written / bfd_octets_per_byte (abfd); + address = list->where + (octets_written + / bfd_octets_per_byte (abfd, NULL)); if (! srec_write_record (abfd, tdata->type, @@ -1082,9 +1076,9 @@ srec_write_symbols (bfd *abfd) bfd_size_type len; asymbol **table = bfd_get_outsymbols (abfd); - len = strlen (abfd->filename); + len = strlen (bfd_get_filename (abfd)); if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3 - || bfd_bwrite (abfd->filename, len, abfd) != len + || bfd_bwrite (bfd_get_filename (abfd), len, abfd) != len || bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2) return FALSE; @@ -1248,37 +1242,40 @@ srec_print_symbol (bfd *abfd, } } -#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_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_bool_bfd_asymbol_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_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_group_name bfd_generic_group_name +#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_hide_symbol _bfd_generic_link_hide_symbol +#define srec_bfd_define_start_stop bfd_generic_define_start_stop +#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 = { @@ -1309,16 +1306,16 @@ const bfd_target srec_vec = _bfd_dummy_target, }, { - bfd_false, + _bfd_bool_bfd_false_error, srec_mkobject, _bfd_generic_mkarchive, - bfd_false, + _bfd_bool_bfd_false_error, }, { /* bfd_write_contents. */ - bfd_false, + _bfd_bool_bfd_false_error, srec_write_object_contents, _bfd_write_archive_contents, - bfd_false, + _bfd_bool_bfd_false_error, }, BFD_JUMP_TABLE_GENERIC (srec), @@ -1365,16 +1362,16 @@ const bfd_target symbolsrec_vec = _bfd_dummy_target, }, { - bfd_false, + _bfd_bool_bfd_false_error, srec_mkobject, _bfd_generic_mkarchive, - bfd_false, + _bfd_bool_bfd_false_error, }, { /* bfd_write_contents. */ - bfd_false, + _bfd_bool_bfd_false_error, symbolsrec_write_object_contents, _bfd_write_archive_contents, - bfd_false, + _bfd_bool_bfd_false_error, }, BFD_JUMP_TABLE_GENERIC (srec),