projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bfd_error_handler bfd_vma and bfd_size_type args
[deliverable/binutils-gdb.git]
/
bfd
/
ihex.c
diff --git
a/bfd/ihex.c
b/bfd/ihex.c
index 47e857ca1a0497dfa48772b797ba4b6a6bf34ed4..5ec8ce723d349c563564530e6a474527b690a974 100644
(file)
--- a/
bfd/ihex.c
+++ b/
bfd/ihex.c
@@
-1,6
+1,5
@@
/* BFD back-end for Intel Hex objects.
/* BFD back-end for Intel Hex objects.
- Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
- 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1995-2017 Free Software Foundation, Inc.
Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
This file is part of BFD, the Binary File Descriptor library.
Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
This file is part of BFD, the Binary File Descriptor library.
@@
-177,7
+176,7
@@
ihex_mkobject (bfd *abfd)
{
struct ihex_data_struct *tdata;
{
struct ihex_data_struct *tdata;
- tdata = bfd_alloc (abfd, sizeof (* tdata));
+ tdata =
(struct ihex_data_struct *)
bfd_alloc (abfd, sizeof (* tdata));
if (tdata == NULL)
return FALSE;
if (tdata == NULL)
return FALSE;
@@
-220,13
+219,14
@@
ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
char buf[10];
if (! ISPRINT (c))
char buf[10];
if (! ISPRINT (c))
- sprintf (buf, "\\%03o", (unsigned int) c);
+ sprintf (buf, "\\%03o", (unsigned int) c
& 0xff
);
else
{
buf[0] = c;
buf[1] = '\0';
}
else
{
buf[0] = c;
buf[1] = '\0';
}
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%d: unexpected character `%s' in Intel Hex file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
(_("%B:%d: unexpected character `%s' in Intel Hex file"),
abfd, lineno, buf);
bfd_set_error (bfd_error_bad_value);
@@
-277,7
+277,7
@@
ihex_scan (bfd *abfd)
else
{
file_ptr pos;
else
{
file_ptr pos;
- char hdr[8];
+
unsigned
char hdr[8];
unsigned int i;
unsigned int len;
bfd_vma addr;
unsigned int i;
unsigned int len;
bfd_vma addr;
@@
-309,7
+309,7
@@
ihex_scan (bfd *abfd)
chars = len * 2 + 2;
if (chars >= bufsize)
{
chars = len * 2 + 2;
if (chars >= bufsize)
{
- buf = bfd_realloc (buf, (bfd_size_type) chars);
+ buf =
(bfd_byte *)
bfd_realloc (buf, (bfd_size_type) chars);
if (buf == NULL)
goto error_return;
bufsize = chars;
if (buf == NULL)
goto error_return;
bufsize = chars;
@@
-322,7
+322,7
@@
ihex_scan (bfd *abfd)
{
if (! ISHEX (buf[i]))
{
{
if (! ISHEX (buf[i]))
{
- ihex_bad_byte (abfd, lineno,
hdr
[i], error);
+ ihex_bad_byte (abfd, lineno,
buf
[i], error);
goto error_return;
}
}
goto error_return;
}
}
@@
-333,7
+333,8
@@
ihex_scan (bfd *abfd)
chksum += HEX2 (buf + 2 * i);
if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
{
chksum += HEX2 (buf + 2 * i);
if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
abfd, lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
(_("%B:%u: bad checksum in Intel Hex file (expected %u, found %u)"),
abfd, lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
@@
-361,7
+362,7
@@
ihex_scan (bfd *abfd)
sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
amt = strlen (secbuf) + 1;
sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
amt = strlen (secbuf) + 1;
- secname = bfd_alloc (abfd, amt);
+ secname =
(char *)
bfd_alloc (abfd, amt);
if (secname == NULL)
goto error_return;
strcpy (secname, secbuf);
if (secname == NULL)
goto error_return;
strcpy (secname, secbuf);
@@
-388,7
+389,8
@@
ihex_scan (bfd *abfd)
/* An extended address record. */
if (len != 2)
{
/* An extended address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: bad extended address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
(_("%B:%u: bad extended address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@
-405,7
+407,8
@@
ihex_scan (bfd *abfd)
/* An extended start address record. */
if (len != 4)
{
/* An extended start address record. */
if (len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: bad extended start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
(_("%B:%u: bad extended start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@
-422,7
+425,8
@@
ihex_scan (bfd *abfd)
/* An extended linear address record. */
if (len != 2)
{
/* An extended linear address record. */
if (len != 2)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: bad extended linear address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
(_("%B:%u: bad extended linear address record length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@
-439,7
+443,8
@@
ihex_scan (bfd *abfd)
/* An extended linear start address record. */
if (len != 2 && len != 4)
{
/* An extended linear start address record. */
if (len != 2 && len != 4)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: bad extended linear start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
(_("%B:%u: bad extended linear start address length in Intel Hex file"),
abfd, lineno);
bfd_set_error (bfd_error_bad_value);
@@
-456,7
+461,8
@@
ihex_scan (bfd *abfd)
break;
default:
break;
default:
- (*_bfd_error_handler)
+ _bfd_error_handler
+ /* xgettext:c-format */
(_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
abfd, lineno, type);
bfd_set_error (bfd_error_bad_value);
(_("%B:%u: unrecognized ihex type %u in Intel Hex file"),
abfd, lineno, type);
bfd_set_error (bfd_error_bad_value);
@@
-554,7
+560,7
@@
ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
error = FALSE;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
error = FALSE;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
- char hdr[8];
+
unsigned
char hdr[8];
unsigned int len;
unsigned int type;
unsigned int i;
unsigned int len;
unsigned int type;
unsigned int i;
@@
-575,7
+581,7
@@
ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
/* We should only see type 0 records here. */
if (type != 0)
{
/* We should only see type 0 records here. */
if (type != 0)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: internal error in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
(_("%B: internal error in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@
-583,7
+589,7
@@
ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
if (len * 2 > bufsize)
{
if (len * 2 > bufsize)
{
- buf = bfd_realloc (buf, (bfd_size_type) len * 2);
+ buf =
(bfd_byte *)
bfd_realloc (buf, (bfd_size_type) len * 2);
if (buf == NULL)
goto error_return;
bufsize = len * 2;
if (buf == NULL)
goto error_return;
bufsize = len * 2;
@@
-609,7
+615,7
@@
ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
if ((bfd_size_type) (p - contents) < section->size)
{
if ((bfd_size_type) (p - contents) < section->size)
{
- (*_bfd_error_handler)
+ _bfd_error_handler
(_("%B: bad section length in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
(_("%B: bad section length in ihex_read_section"), abfd);
bfd_set_error (bfd_error_bad_value);
goto error_return;
@@
-640,7
+646,8
@@
ihex_get_section_contents (bfd *abfd,
section->used_by_bfd = bfd_alloc (abfd, section->size);
if (section->used_by_bfd == NULL)
return FALSE;
section->used_by_bfd = bfd_alloc (abfd, section->size);
if (section->used_by_bfd == NULL)
return FALSE;
- if (! ihex_read_section (abfd, section, section->used_by_bfd))
+ if (! ihex_read_section (abfd, section,
+ (bfd_byte *) section->used_by_bfd))
return FALSE;
}
return FALSE;
}
@@
-668,11
+675,11
@@
ihex_set_section_contents (bfd *abfd,
|| (section->flags & SEC_LOAD) == 0)
return TRUE;
|| (section->flags & SEC_LOAD) == 0)
return TRUE;
- n = bfd_alloc (abfd, sizeof (* n));
+ n =
(struct ihex_data_list *)
bfd_alloc (abfd, sizeof (* n));
if (n == NULL)
return FALSE;
if (n == NULL)
return FALSE;
- data = bfd_alloc (abfd, count);
+ data =
(bfd_byte *)
bfd_alloc (abfd, count);
if (data == NULL)
return FALSE;
memcpy (data, location, (size_t) count);
if (data == NULL)
return FALSE;
memcpy (data, location, (size_t) count);
@@
-818,12
+825,10
@@
ihex_write_object_contents (bfd *abfd)
extbase = where & 0xffff0000;
if (where > extbase + 0xffff)
{
extbase = where & 0xffff0000;
if (where > extbase + 0xffff)
{
- char buf[20];
-
- sprintf_vma (buf, where);
- (*_bfd_error_handler)
- (_("%s: address 0x%s out of range for Intel Hex file"),
- bfd_get_filename (abfd), buf);
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%B: address %#Lx out of range for Intel Hex file"),
+ abfd, where);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
@@
-918,10
+923,12
@@
ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
#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_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_get_symbol_version_string _bfd_nosymbols_get_symbol_version_string
#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
#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
+#define ihex_find_line _bfd_nosymbols_find_line
#define ihex_find_inliner_info _bfd_nosymbols_find_inliner_info
#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols
#define ihex_find_inliner_info _bfd_nosymbols_find_inliner_info
#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols
@@
-929,16
+936,20
@@
ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
#define ihex_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
#define ihex_bfd_relax_section bfd_generic_relax_section
#define ihex_bfd_gc_sections bfd_generic_gc_sections
#define ihex_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
#define ihex_bfd_relax_section bfd_generic_relax_section
#define ihex_bfd_gc_sections bfd_generic_gc_sections
+#define ihex_bfd_lookup_section_flags bfd_generic_lookup_section_flags
#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_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_define_common_symbol bfd_generic_define_common_symbol
+#define ihex_bfd_define_start_stop bfd_generic_define_start_stop
#define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
#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_link_add_symbols _bfd_generic_link_add_symbols
#define ihex_bfd_link_just_syms _bfd_generic_link_just_syms
+#define ihex_bfd_copy_link_hash_symbol_type _bfd_generic_copy_link_hash_symbol_type
#define ihex_bfd_final_link _bfd_generic_final_link
#define ihex_bfd_link_split_section _bfd_generic_link_split_section
#define ihex_bfd_final_link _bfd_generic_final_link
#define ihex_bfd_link_split_section _bfd_generic_link_split_section
+#define ihex_bfd_link_check_relocs _bfd_generic_link_check_relocs
/* The Intel Hex target vector. */
/* The Intel Hex target vector. */
@@
-953,6
+964,7
@@
const bfd_target ihex_vec =
0, /* Leading underscore. */
' ', /* AR_pad_char. */
16, /* AR_max_namelen. */
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_getb64, bfd_getb_signed_64, bfd_putb64,
bfd_getb32, bfd_getb_signed_32, bfd_putb32,
bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* Data. */
This page took
0.028967 seconds
and
4
git commands to generate.