/* BFD back-end for s-record objects.
- Copyright (C) 1990-2017 Free Software Foundation, Inc.
+ Copyright (C) 1990-2020 Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
This file is part of BFD, the Binary File Descriptor library.
_start $14
_etext $8036
_edata $8036
- _end $8036
+ _end $8036
$$
DESCRIPTION
}
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%d: Unexpected character `%s' in S-record file\n"),
+ (_("%pB:%d: unexpected character `%s' in S-record file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
}
if (bytes < min_bytes)
{
/* xgettext:c-format */
- _bfd_error_handler (_("%B:%d: byte count %d too small\n"),
+ _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;
{
char secbuf[20];
char *secname;
- bfd_size_type amt;
+ size_t amt;
flagword flags;
sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%d: Bad checksum in S-record file\n"),
+ (_("%pB:%d: bad checksum in S-record file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
{
_bfd_error_handler
/* xgettext:c-format */
- (_("%B:%d: Bad checksum in S-record file\n"),
+ (_("%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;
}
}
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;
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;
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. */
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;
{
default:
BFD_ASSERT (sofar == section->size);
- if (buf != NULL)
- free (buf);
+ free (buf);
return TRUE;
case '3':
{
/* We've come to the end of this section. */
BFD_ASSERT (sofar == section->size);
- if (buf != NULL)
- free (buf);
+ free (buf);
return TRUE;
}
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;
}
return FALSE;
if (! srec_read_section (abfd, section,
- (bfd_byte *) section->used_by_bfd))
+ (bfd_byte *) section->used_by_bfd))
return FALSE;
}
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;
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
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,
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;
}
}
-#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_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
+#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 =
{
_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),
_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),
projects / deliverable / binutils-gdb.git / blobdiff