/* BFD back-end for Intel Hex objects.
- Copyright 1995 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 1997, 1998, 1999 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.
static asymbol *ihex_make_empty_symbol PARAMS ((bfd *));
static boolean ihex_set_arch_mach
PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static int ihex_sizeof_headers PARAMS ((bfd *, boolean));
/* The number of bytes we put on one line during output. */
buf[1] = '\0';
}
(*_bfd_error_handler)
- ("%s:%d: unexpected character `%s' in Intel Hex file\n",
+ (_("%s:%d: unexpected character `%s' in Intel Hex file\n"),
bfd_get_filename (abfd), lineno, buf);
bfd_set_error (bfd_error_bad_value);
}
bfd *abfd;
{
bfd_vma segbase;
+ bfd_vma extbase;
asection *sec;
int lineno;
boolean error;
- bfd_byte *buf;
+ bfd_byte *buf = NULL;
size_t bufsize;
int c;
abfd->start_address = 0;
segbase = 0;
+ extbase = 0;
sec = NULL;
lineno = 1;
error = false;
- buf = NULL;
bufsize = 0;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
{
if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
{
(*_bfd_error_handler)
- ("%s:%d: bad checksum in Intel Hex file (expected %u, found %u)",
+ (_("%s:%d: bad checksum in Intel Hex file (expected %u, found %u)"),
bfd_get_filename (abfd), lineno,
(- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
bfd_set_error (bfd_error_bad_value);
case 0:
/* This is a data record. */
if (sec != NULL
- && sec->vma + sec->_raw_size == segbase + addr)
+ && sec->vma + sec->_raw_size == extbase + segbase + addr)
{
/* This data goes at the end of the section we are
currently building. */
if (sec == NULL)
goto error_return;
sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
- sec->vma = segbase + addr;
- sec->lma = segbase + addr;
+ sec->vma = extbase + segbase + addr;
+ sec->lma = extbase + segbase + addr;
sec->_raw_size = len;
sec->filepos = pos;
}
if (len != 2)
{
(*_bfd_error_handler)
- ("%s:%d: bad extended address record length in Intel Hex file",
+ (_("%s:%d: bad extended address record length in Intel Hex file"),
bfd_get_filename (abfd), lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
if (len != 4)
{
(*_bfd_error_handler)
- ("%s:%d: bad extended start address length in Intel Hex file",
+ (_("%s:%d: bad extended start address length in Intel Hex file"),
bfd_get_filename (abfd), lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
if (len != 2)
{
(*_bfd_error_handler)
- ("%s:%d: bad extended linear address record length in Intel Hex file",
+ (_("%s:%d: bad extended linear address record length in Intel Hex file"),
bfd_get_filename (abfd), lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
}
- segbase = HEX4 (buf) << 16;
+ extbase = HEX4 (buf) << 16;
sec = NULL;
if (len != 2 && len != 4)
{
(*_bfd_error_handler)
- ("%s:%d: bad extended linear start address length in Intel Hex file",
+ (_("%s:%d: bad extended linear start address length in Intel Hex file"),
bfd_get_filename (abfd), lineno);
bfd_set_error (bfd_error_bad_value);
goto error_return;
default:
(*_bfd_error_handler)
- ("%s:%d: unrecognized ihex type %u in Intel Hex file\n",
+ (_("%s:%d: unrecognized ihex type %u in Intel Hex file\n"),
bfd_get_filename (abfd), lineno, type);
bfd_set_error (bfd_error_bad_value);
goto error_return;
{
int c;
bfd_byte *p;
- bfd_byte *buf;
+ bfd_byte *buf = NULL;
size_t bufsize;
boolean error;
goto error_return;
p = contents;
- buf = NULL;
bufsize = 0;
error = false;
while ((c = ihex_get_byte (abfd, &error)) != EOF)
if (type != 0)
{
(*_bfd_error_handler)
- ("%s: internal error in ihex_read_section",
+ (_("%s: internal error in ihex_read_section"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
goto error_return;
if ((bfd_size_type) (p - contents) < section->_raw_size)
{
(*_bfd_error_handler)
- ("%s: bad section length in ihex_read_section",
+ (_("%s: bad section length in ihex_read_section"),
bfd_get_filename (abfd));
bfd_set_error (bfd_error_bad_value);
goto error_return;
bfd *abfd;
{
bfd_vma segbase;
+ bfd_vma extbase;
struct ihex_data_list *l;
segbase = 0;
+ extbase = 0;
for (l = abfd->tdata.ihex_data->head; l != NULL; l = l->next)
{
bfd_vma where;
if (now > CHUNK)
now = CHUNK;
- if (where > segbase + 0xffff)
+ if (where > segbase + extbase + 0xffff)
{
bfd_byte addr[2];
/* We need a new base address. */
if (where <= 0xfffff)
{
+ /* The addresses should be sorted. */
+ BFD_ASSERT (extbase == 0);
+
segbase = where & 0xf0000;
- addr[0] = (segbase >> 12) & 0xff;
- addr[1] = (segbase >> 4) & 0xff;
+ addr[0] = (bfd_byte)(segbase >> 12) & 0xff;
+ addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
if (! ihex_write_record (abfd, 2, 0, 2, addr))
return false;
}
else
{
- segbase = where & 0xffff0000;
- if (where > segbase + 0xffff)
+ /* The extended address record and the extended
+ linear address record are combined, at least by
+ some readers. We need an extended linear address
+ record here, so if we've already written out an
+ extended address record, zero it out to avoid
+ confusion. */
+ if (segbase != 0)
+ {
+ addr[0] = 0;
+ addr[1] = 0;
+ if (! ihex_write_record (abfd, 2, 0, 2, addr))
+ return false;
+ segbase = 0;
+ }
+
+ 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 Intex Hex file",
+ (_("%s: address 0x%s out of range for Intex Hex file"),
bfd_get_filename (abfd), buf);
bfd_set_error (bfd_error_bad_value);
return false;
}
- addr[0] = (segbase >> 24) & 0xff;
- addr[1] = (segbase >> 16) & 0xff;
+ addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
+ addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
if (! ihex_write_record (abfd, 2, 0, 4, addr))
return false;
}
}
- if (! ihex_write_record (abfd, now, where - segbase, 0, p))
+ if (! ihex_write_record (abfd, now, where - (extbase + segbase),
+ 0, p))
return false;
where += now;
if (start <= 0xfffff)
{
- startbuf[0] = ((start & 0xf0000) >> 12) & 0xff;
+ startbuf[0] = (bfd_byte)((start & 0xf0000) >> 12) & 0xff;
startbuf[1] = 0;
- startbuf[2] = (start >> 8) & 0xff;
- startbuf[3] = start & 0xff;
+ startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
+ startbuf[3] = (bfd_byte)start & 0xff;
if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
return false;
}
else
{
- startbuf[0] = (start >> 24) & 0xff;
- startbuf[1] = (start >> 16) & 0xff;
- startbuf[2] = (start >> 8) & 0xff;
- startbuf[3] = start & 0xff;
+ startbuf[0] = (bfd_byte)(start >> 24) & 0xff;
+ startbuf[1] = (bfd_byte)(start >> 16) & 0xff;
+ startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
+ startbuf[3] = (bfd_byte)start & 0xff;
if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
return false;
}
/*ARGSUSED*/
static int
ihex_sizeof_headers (abfd, exec)
- bfd *abfd;
- boolean exec;
+ bfd *abfd ATTRIBUTE_UNUSED;
+ boolean exec ATTRIBUTE_UNUSED;
{
return 0;
}
((long (*) PARAMS ((bfd *, asymbol **))) bfd_0l)
#define ihex_print_symbol _bfd_nosymbols_print_symbol
#define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define ihex_bfd_is_local_label _bfd_nosymbols_bfd_is_local_label
+#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_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
#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_link_hash_table_create _bfd_generic_link_hash_table_create
#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols
#define ihex_bfd_final_link _bfd_generic_final_link
BFD_JUMP_TABLE_LINK (ihex),
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+ NULL,
+
(PTR) 0
};
projects / deliverable / binutils-gdb.git / blobdiff