1999-05-03 07:29:11 +00:00
|
|
|
/* BFD back-end for s-record objects.
|
2001-03-08 21:04:02 +00:00
|
|
|
Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
2002-01-06 07:30:35 +00:00
|
|
|
2000, 2001, 2002
|
1999-05-03 07:29:11 +00:00
|
|
|
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.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
/*
|
|
|
|
SUBSECTION
|
|
|
|
S-Record handling
|
|
|
|
|
|
|
|
DESCRIPTION
|
2000-12-20 00:21:57 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
Ordinary S-Records cannot hold anything but addresses and
|
|
|
|
data, so that's all that we implement.
|
|
|
|
|
|
|
|
The only interesting thing is that S-Records may come out of
|
|
|
|
order and there is no header, so an initial scan is required
|
|
|
|
to discover the minimum and maximum addresses used to create
|
|
|
|
the vma and size of the only section we create. We
|
|
|
|
arbitrarily call this section ".text".
|
|
|
|
|
|
|
|
When bfd_get_section_contents is called the file is read
|
|
|
|
again, and this time the data is placed into a bfd_alloc'd
|
|
|
|
area.
|
|
|
|
|
|
|
|
Any number of sections may be created for output, we save them
|
|
|
|
up and output them when it's time to close the bfd.
|
|
|
|
|
|
|
|
An s record looks like:
|
2000-12-20 00:21:57 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
EXAMPLE
|
|
|
|
S<type><length><address><data><checksum>
|
2000-12-20 00:21:57 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
DESCRIPTION
|
|
|
|
Where
|
|
|
|
o length
|
|
|
|
is the number of bytes following upto the checksum. Note that
|
|
|
|
this is not the number of chars following, since it takes two
|
|
|
|
chars to represent a byte.
|
|
|
|
o type
|
|
|
|
is one of:
|
|
|
|
0) header record
|
|
|
|
1) two byte address data record
|
|
|
|
2) three byte address data record
|
|
|
|
3) four byte address data record
|
|
|
|
7) four byte address termination record
|
|
|
|
8) three byte address termination record
|
|
|
|
9) two byte address termination record
|
2000-12-20 00:21:57 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
o address
|
|
|
|
is the start address of the data following, or in the case of
|
|
|
|
a termination record, the start address of the image
|
|
|
|
o data
|
|
|
|
is the data.
|
|
|
|
o checksum
|
|
|
|
is the sum of all the raw byte data in the record, from the length
|
|
|
|
upwards, modulo 256 and subtracted from 255.
|
|
|
|
|
|
|
|
SUBSECTION
|
|
|
|
Symbol S-Record handling
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Some ICE equipment understands an addition to the standard
|
|
|
|
S-Record format; symbols and their addresses can be sent
|
|
|
|
before the data.
|
|
|
|
|
|
|
|
The format of this is:
|
|
|
|
($$ <modulename>
|
|
|
|
(<space> <symbol> <address>)*)
|
|
|
|
$$
|
|
|
|
|
|
|
|
so a short symbol table could look like:
|
|
|
|
|
|
|
|
EXAMPLE
|
|
|
|
$$ flash.x
|
|
|
|
$$ flash.c
|
|
|
|
_port6 $0
|
|
|
|
_delay $4
|
|
|
|
_start $14
|
|
|
|
_etext $8036
|
|
|
|
_edata $8036
|
|
|
|
_end $8036
|
|
|
|
$$
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
We allow symbols to be anywhere in the data stream - the module names
|
|
|
|
are always ignored.
|
2000-12-20 00:21:57 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "bfd.h"
|
|
|
|
#include "sysdep.h"
|
|
|
|
#include "libbfd.h"
|
|
|
|
#include "libiberty.h"
|
2001-09-19 05:33:36 +00:00
|
|
|
#include "safe-ctype.h"
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
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));
|
|
|
|
static boolean srec_mkobject PARAMS ((bfd *));
|
|
|
|
static int srec_get_byte PARAMS ((bfd *, boolean *));
|
|
|
|
static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
|
|
|
|
static boolean srec_scan PARAMS ((bfd *));
|
|
|
|
static const bfd_target *srec_object_p PARAMS ((bfd *));
|
|
|
|
static const bfd_target *symbolsrec_object_p PARAMS ((bfd *));
|
|
|
|
static boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *));
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
static boolean srec_write_record PARAMS ((bfd *, unsigned int, bfd_vma,
|
1999-05-03 07:29:11 +00:00
|
|
|
const bfd_byte *,
|
|
|
|
const bfd_byte *));
|
|
|
|
static boolean srec_write_header PARAMS ((bfd *));
|
|
|
|
static boolean srec_write_symbols PARAMS ((bfd *));
|
|
|
|
static boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
|
|
|
|
static boolean srec_get_section_contents
|
|
|
|
PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
|
|
|
|
static boolean srec_set_arch_mach
|
|
|
|
PARAMS ((bfd *, enum bfd_architecture, unsigned long));
|
|
|
|
static boolean srec_set_section_contents
|
|
|
|
PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
|
|
|
|
static boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
|
|
|
|
static boolean srec_write_object_contents PARAMS ((bfd *));
|
|
|
|
static boolean symbolsrec_write_object_contents PARAMS ((bfd *));
|
|
|
|
static int srec_sizeof_headers PARAMS ((bfd *, boolean));
|
|
|
|
static long srec_get_symtab_upper_bound PARAMS ((bfd *));
|
|
|
|
static long srec_get_symtab PARAMS ((bfd *, asymbol **));
|
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Macros for converting between hex and binary. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
static const char digs[] = "0123456789ABCDEF";
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
#define NIBBLE(x) hex_value(x)
|
|
|
|
#define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1]))
|
|
|
|
#define TOHEX(d, x, ch) \
|
|
|
|
d[1] = digs[(x) & 0xf]; \
|
|
|
|
d[0] = digs[((x)>>4)&0xf]; \
|
|
|
|
ch += ((x) & 0xff);
|
|
|
|
#define ISHEX(x) hex_p(x)
|
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Initialize by filling in the hex conversion array. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
static void
|
|
|
|
srec_init ()
|
|
|
|
{
|
|
|
|
static boolean inited = false;
|
|
|
|
|
2002-06-25 06:21:54 +00:00
|
|
|
if (! inited)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
inited = true;
|
|
|
|
hex_init ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-04-04 03:05:51 +00:00
|
|
|
/* The maximum number of address+data+crc bytes on a line is FF. */
|
1999-05-03 07:29:11 +00:00
|
|
|
#define MAXCHUNK 0xff
|
2000-11-03 01:47:13 +00:00
|
|
|
|
|
|
|
/* Default size for a CHUNK. */
|
|
|
|
#define DEFAULT_CHUNK 16
|
|
|
|
|
2002-04-04 03:05:51 +00:00
|
|
|
/* The number of data bytes we actually fit onto a line on output.
|
2000-11-03 01:47:13 +00:00
|
|
|
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;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
struct srec_data_list_struct
|
|
|
|
{
|
|
|
|
struct srec_data_list_struct *next;
|
|
|
|
bfd_byte *data;
|
|
|
|
bfd_vma where;
|
|
|
|
bfd_size_type size;
|
|
|
|
};
|
|
|
|
|
|
|
|
typedef struct srec_data_list_struct srec_data_list_type;
|
|
|
|
|
|
|
|
/* When scanning the S-record file, a linked list of srec_symbol
|
|
|
|
structures is built to represent the symbol table (if there is
|
|
|
|
one). */
|
|
|
|
|
|
|
|
struct srec_symbol
|
|
|
|
{
|
|
|
|
struct srec_symbol *next;
|
|
|
|
const char *name;
|
|
|
|
bfd_vma val;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* The S-record tdata information. */
|
|
|
|
|
|
|
|
typedef struct srec_data_struct
|
|
|
|
{
|
|
|
|
srec_data_list_type *head;
|
|
|
|
srec_data_list_type *tail;
|
|
|
|
unsigned int type;
|
|
|
|
struct srec_symbol *symbols;
|
|
|
|
struct srec_symbol *symtail;
|
|
|
|
asymbol *csymbols;
|
|
|
|
}
|
|
|
|
tdata_type;
|
|
|
|
|
|
|
|
static boolean srec_write_section PARAMS ((bfd *, tdata_type *,
|
|
|
|
srec_data_list_type *));
|
|
|
|
static boolean srec_write_terminator PARAMS ((bfd *, tdata_type *));
|
|
|
|
|
|
|
|
/* Set up the S-record tdata information. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_mkobject (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2002-07-30 05:49:24 +00:00
|
|
|
bfd_size_type amt;
|
|
|
|
tdata_type *tdata;
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
srec_init ();
|
|
|
|
|
2002-07-30 05:49:24 +00:00
|
|
|
amt = sizeof (tdata_type);
|
|
|
|
tdata = (tdata_type *) bfd_alloc (abfd, amt);
|
|
|
|
if (tdata == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
abfd->tdata.srec_data = tdata;
|
|
|
|
tdata->type = 1;
|
|
|
|
tdata->head = NULL;
|
|
|
|
tdata->tail = NULL;
|
|
|
|
tdata->symbols = NULL;
|
|
|
|
tdata->symtail = NULL;
|
|
|
|
tdata->csymbols = NULL;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read a byte from an S record file. Set *ERRORPTR if an error
|
|
|
|
occurred. Return EOF on error or end of file. */
|
|
|
|
|
|
|
|
static int
|
|
|
|
srec_get_byte (abfd, errorptr)
|
|
|
|
bfd *abfd;
|
|
|
|
boolean *errorptr;
|
|
|
|
{
|
|
|
|
bfd_byte c;
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bread (&c, (bfd_size_type) 1, abfd) != 1)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
if (bfd_get_error () != bfd_error_file_truncated)
|
|
|
|
*errorptr = true;
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
|
|
|
|
return (int) (c & 0xff);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Report a problem in an S record file. FIXME: This probably should
|
|
|
|
not call fprintf, but we really do need some mechanism for printing
|
|
|
|
error messages. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
srec_bad_byte (abfd, lineno, c, error)
|
|
|
|
bfd *abfd;
|
|
|
|
unsigned int lineno;
|
|
|
|
int c;
|
|
|
|
boolean error;
|
|
|
|
{
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
if (! error)
|
|
|
|
bfd_set_error (bfd_error_file_truncated);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char buf[10];
|
|
|
|
|
2001-09-19 05:33:36 +00:00
|
|
|
if (! ISPRINT (c))
|
1999-05-03 07:29:11 +00:00
|
|
|
sprintf (buf, "\\%03o", (unsigned int) c);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
buf[0] = c;
|
|
|
|
buf[1] = '\0';
|
|
|
|
}
|
|
|
|
(*_bfd_error_handler)
|
|
|
|
(_("%s:%d: Unexpected character `%s' in S-record file\n"),
|
2001-09-20 23:30:37 +00:00
|
|
|
bfd_archive_filename (abfd), lineno, buf);
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_set_error (bfd_error_bad_value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a new symbol found in an S-record file. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_new_symbol (abfd, name, val)
|
|
|
|
bfd *abfd;
|
|
|
|
const char *name;
|
|
|
|
bfd_vma val;
|
|
|
|
{
|
|
|
|
struct srec_symbol *n;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_size_type amt = sizeof (struct srec_symbol);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
n = (struct srec_symbol *) bfd_alloc (abfd, amt);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (n == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
n->name = name;
|
|
|
|
n->val = val;
|
|
|
|
|
|
|
|
if (abfd->tdata.srec_data->symbols == NULL)
|
|
|
|
abfd->tdata.srec_data->symbols = n;
|
|
|
|
else
|
|
|
|
abfd->tdata.srec_data->symtail->next = n;
|
|
|
|
abfd->tdata.srec_data->symtail = n;
|
|
|
|
n->next = NULL;
|
|
|
|
|
|
|
|
++abfd->symcount;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the S record file and turn it into sections. We create a new
|
|
|
|
section for each contiguous set of bytes. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_scan (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
unsigned int lineno = 1;
|
|
|
|
boolean error = false;
|
|
|
|
bfd_byte *buf = NULL;
|
|
|
|
size_t bufsize = 0;
|
|
|
|
asection *sec = NULL;
|
|
|
|
char *symbuf = NULL;
|
|
|
|
|
|
|
|
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != EOF)
|
|
|
|
{
|
|
|
|
/* We only build sections from contiguous S-records, so if this
|
|
|
|
is not an S-record, then stop building a section. */
|
|
|
|
if (c != 'S' && c != '\r' && c != '\n')
|
|
|
|
sec = NULL;
|
|
|
|
|
|
|
|
switch (c)
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
case '\n':
|
|
|
|
++lineno;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '\r':
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '$':
|
|
|
|
/* Starting a module name, which we ignore. */
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != '\n'
|
|
|
|
&& c != EOF)
|
|
|
|
;
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
++lineno;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ' ':
|
|
|
|
do
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_size_type alc;
|
1999-05-03 07:29:11 +00:00
|
|
|
char *p, *symname;
|
|
|
|
bfd_vma symval;
|
|
|
|
|
|
|
|
/* Starting a symbol definition. */
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != EOF
|
|
|
|
&& (c == ' ' || c == '\t'))
|
|
|
|
;
|
|
|
|
|
|
|
|
if (c == '\n' || c == '\r')
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
alc = 10;
|
|
|
|
symbuf = (char *) bfd_malloc (alc + 1);
|
|
|
|
if (symbuf == NULL)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
p = symbuf;
|
|
|
|
|
|
|
|
*p++ = c;
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != EOF
|
2001-09-19 05:33:36 +00:00
|
|
|
&& ! ISSPACE (c))
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if ((bfd_size_type) (p - symbuf) >= alc)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
char *n;
|
|
|
|
|
|
|
|
alc *= 2;
|
|
|
|
n = (char *) bfd_realloc (symbuf, alc + 1);
|
|
|
|
if (n == NULL)
|
|
|
|
goto error_return;
|
|
|
|
p = n + (p - symbuf);
|
|
|
|
symbuf = n;
|
|
|
|
}
|
|
|
|
|
|
|
|
*p++ = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
*p++ = '\0';
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
symname = bfd_alloc (abfd, (bfd_size_type) (p - symbuf));
|
1999-05-03 07:29:11 +00:00
|
|
|
if (symname == NULL)
|
|
|
|
goto error_return;
|
|
|
|
strcpy (symname, symbuf);
|
|
|
|
free (symbuf);
|
|
|
|
symbuf = NULL;
|
|
|
|
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != EOF
|
|
|
|
&& (c == ' ' || c == '\t'))
|
|
|
|
;
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Skip a dollar sign before the hex value. */
|
|
|
|
if (c == '$')
|
|
|
|
{
|
|
|
|
c = srec_get_byte (abfd, &error);
|
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
symval = 0;
|
|
|
|
while (ISHEX (c))
|
|
|
|
{
|
|
|
|
symval <<= 4;
|
|
|
|
symval += NIBBLE (c);
|
|
|
|
c = srec_get_byte (abfd, &error);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! srec_new_symbol (abfd, symname, symval))
|
|
|
|
goto error_return;
|
|
|
|
}
|
2000-07-06 23:26:55 +00:00
|
|
|
while (c == ' ' || c == '\t')
|
|
|
|
;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (c == '\n')
|
|
|
|
++lineno;
|
|
|
|
else if (c != '\r')
|
|
|
|
{
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
2000-07-06 23:26:55 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
case 'S':
|
|
|
|
{
|
|
|
|
file_ptr pos;
|
|
|
|
char hdr[3];
|
|
|
|
unsigned int bytes;
|
|
|
|
bfd_vma address;
|
|
|
|
bfd_byte *data;
|
|
|
|
|
|
|
|
/* Starting an S-record. */
|
|
|
|
|
|
|
|
pos = bfd_tell (abfd) - 1;
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3)
|
1999-05-03 07:29:11 +00:00
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
if (! ISHEX (hdr[1]) || ! ISHEX (hdr[2]))
|
|
|
|
{
|
|
|
|
if (! ISHEX (hdr[1]))
|
|
|
|
c = hdr[1];
|
|
|
|
else
|
|
|
|
c = hdr[2];
|
|
|
|
srec_bad_byte (abfd, lineno, c, error);
|
|
|
|
goto error_return;
|
|
|
|
}
|
|
|
|
|
|
|
|
bytes = HEX (hdr + 1);
|
|
|
|
if (bytes * 2 > bufsize)
|
|
|
|
{
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (buf == NULL)
|
|
|
|
goto error_return;
|
|
|
|
bufsize = bytes * 2;
|
|
|
|
}
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
|
1999-05-03 07:29:11 +00:00
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
/* Ignore the checksum byte. */
|
|
|
|
--bytes;
|
|
|
|
|
|
|
|
address = 0;
|
|
|
|
data = buf;
|
|
|
|
switch (hdr[0])
|
|
|
|
{
|
|
|
|
case '0':
|
|
|
|
case '5':
|
|
|
|
/* Prologue--ignore the file name, but stop building a
|
|
|
|
section at this point. */
|
|
|
|
sec = NULL;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '3':
|
|
|
|
address = HEX (data);
|
|
|
|
data += 2;
|
|
|
|
--bytes;
|
|
|
|
/* Fall through. */
|
|
|
|
case '2':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
--bytes;
|
|
|
|
/* Fall through. */
|
|
|
|
case '1':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
bytes -= 2;
|
|
|
|
|
|
|
|
if (sec != NULL
|
|
|
|
&& sec->vma + sec->_raw_size == address)
|
|
|
|
{
|
|
|
|
/* This data goes at the end of the section we are
|
|
|
|
currently building. */
|
|
|
|
sec->_raw_size += bytes;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
char secbuf[20];
|
|
|
|
char *secname;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_size_type amt;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
amt = strlen (secbuf) + 1;
|
|
|
|
secname = (char *) bfd_alloc (abfd, amt);
|
1999-05-03 07:29:11 +00:00
|
|
|
strcpy (secname, secbuf);
|
|
|
|
sec = bfd_make_section (abfd, secname);
|
|
|
|
if (sec == NULL)
|
|
|
|
goto error_return;
|
|
|
|
sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
|
|
|
|
sec->vma = address;
|
|
|
|
sec->lma = address;
|
|
|
|
sec->_raw_size = bytes;
|
|
|
|
sec->filepos = pos;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '7':
|
|
|
|
address = HEX (data);
|
|
|
|
data += 2;
|
|
|
|
/* Fall through. */
|
|
|
|
case '8':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
/* Fall through. */
|
|
|
|
case '9':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
|
|
|
|
/* This is a termination record. */
|
|
|
|
abfd->start_address = address;
|
|
|
|
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (error)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
if (symbuf != NULL)
|
|
|
|
free (symbuf);
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether an existing file is an S-record file. */
|
|
|
|
|
|
|
|
static const bfd_target *
|
|
|
|
srec_object_p (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2002-07-30 05:49:24 +00:00
|
|
|
PTR tdata_save;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_byte b[4];
|
|
|
|
|
|
|
|
srec_init ();
|
|
|
|
|
|
|
|
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
|| bfd_bread (b, (bfd_size_type) 4, abfd) != 4)
|
1999-05-03 07:29:11 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (b[0] != 'S' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3]))
|
|
|
|
{
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-07-30 05:49:24 +00:00
|
|
|
tdata_save = abfd->tdata.any;
|
|
|
|
if (! srec_mkobject (abfd) || ! srec_scan (abfd))
|
|
|
|
{
|
|
|
|
if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
|
|
|
|
bfd_release (abfd, abfd->tdata.any);
|
|
|
|
abfd->tdata.any = tdata_save;
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (abfd->symcount > 0)
|
|
|
|
abfd->flags |= HAS_SYMS;
|
|
|
|
|
|
|
|
return abfd->xvec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check whether an existing file is an S-record file with symbols. */
|
|
|
|
|
|
|
|
static const bfd_target *
|
|
|
|
symbolsrec_object_p (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2002-07-30 05:49:24 +00:00
|
|
|
PTR tdata_save;
|
1999-05-03 07:29:11 +00:00
|
|
|
char b[2];
|
|
|
|
|
|
|
|
srec_init ();
|
|
|
|
|
|
|
|
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
|| bfd_bread (b, (bfd_size_type) 2, abfd) != 2)
|
1999-05-03 07:29:11 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (b[0] != '$' || b[1] != '$')
|
|
|
|
{
|
|
|
|
bfd_set_error (bfd_error_wrong_format);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-07-30 05:49:24 +00:00
|
|
|
tdata_save = abfd->tdata.any;
|
|
|
|
if (! srec_mkobject (abfd) || ! srec_scan (abfd))
|
|
|
|
{
|
|
|
|
if (abfd->tdata.any != tdata_save && abfd->tdata.any != NULL)
|
|
|
|
bfd_release (abfd, abfd->tdata.any);
|
|
|
|
abfd->tdata.any = tdata_save;
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (abfd->symcount > 0)
|
|
|
|
abfd->flags |= HAS_SYMS;
|
|
|
|
|
|
|
|
return abfd->xvec;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read in the contents of a section in an S-record file. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_read_section (abfd, section, contents)
|
|
|
|
bfd *abfd;
|
|
|
|
asection *section;
|
|
|
|
bfd_byte *contents;
|
|
|
|
{
|
|
|
|
int c;
|
|
|
|
bfd_size_type sofar = 0;
|
|
|
|
boolean error = false;
|
|
|
|
bfd_byte *buf = NULL;
|
|
|
|
size_t bufsize = 0;
|
|
|
|
|
|
|
|
if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
while ((c = srec_get_byte (abfd, &error)) != EOF)
|
|
|
|
{
|
|
|
|
bfd_byte hdr[3];
|
|
|
|
unsigned int bytes;
|
|
|
|
bfd_vma address;
|
|
|
|
bfd_byte *data;
|
|
|
|
|
|
|
|
if (c == '\r' || c == '\n')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* This is called after srec_scan has already been called, so we
|
|
|
|
ought to know the exact format. */
|
|
|
|
BFD_ASSERT (c == 'S');
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bread (hdr, (bfd_size_type) 3, abfd) != 3)
|
1999-05-03 07:29:11 +00:00
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
BFD_ASSERT (ISHEX (hdr[1]) && ISHEX (hdr[2]));
|
|
|
|
|
|
|
|
bytes = HEX (hdr + 1);
|
|
|
|
|
|
|
|
if (bytes * 2 > bufsize)
|
|
|
|
{
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (buf == NULL)
|
|
|
|
goto error_return;
|
|
|
|
bufsize = bytes * 2;
|
|
|
|
}
|
|
|
|
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bread (buf, (bfd_size_type) bytes * 2, abfd) != bytes * 2)
|
1999-05-03 07:29:11 +00:00
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
address = 0;
|
|
|
|
data = buf;
|
|
|
|
switch (hdr[0])
|
|
|
|
{
|
|
|
|
default:
|
|
|
|
BFD_ASSERT (sofar == section->_raw_size);
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case '3':
|
|
|
|
address = HEX (data);
|
|
|
|
data += 2;
|
|
|
|
--bytes;
|
|
|
|
/* Fall through. */
|
|
|
|
case '2':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
--bytes;
|
|
|
|
/* Fall through. */
|
|
|
|
case '1':
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
address = (address << 8) | HEX (data);
|
|
|
|
data += 2;
|
|
|
|
bytes -= 2;
|
|
|
|
|
|
|
|
if (address != section->vma + sofar)
|
|
|
|
{
|
|
|
|
/* We've come to the end of this section. */
|
|
|
|
BFD_ASSERT (sofar == section->_raw_size);
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Don't consider checksum. */
|
|
|
|
--bytes;
|
|
|
|
|
|
|
|
while (bytes-- != 0)
|
|
|
|
{
|
|
|
|
contents[sofar] = HEX (data);
|
|
|
|
data += 2;
|
|
|
|
++sofar;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (error)
|
|
|
|
goto error_return;
|
|
|
|
|
|
|
|
BFD_ASSERT (sofar == section->_raw_size);
|
|
|
|
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
error_return:
|
|
|
|
if (buf != NULL)
|
|
|
|
free (buf);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get the contents of a section in an S-record file. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_get_section_contents (abfd, section, location, offset, count)
|
|
|
|
bfd *abfd;
|
|
|
|
asection *section;
|
|
|
|
PTR location;
|
|
|
|
file_ptr offset;
|
|
|
|
bfd_size_type count;
|
|
|
|
{
|
|
|
|
if (section->used_by_bfd == NULL)
|
|
|
|
{
|
|
|
|
section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (section->used_by_bfd == NULL && section->_raw_size != 0)
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
if (! srec_read_section (abfd, section, section->used_by_bfd))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
|
|
|
|
(size_t) count);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the architecture. We accept an unknown architecture here. */
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_set_arch_mach (abfd, arch, mach)
|
|
|
|
bfd *abfd;
|
|
|
|
enum bfd_architecture arch;
|
|
|
|
unsigned long mach;
|
|
|
|
{
|
|
|
|
if (arch == bfd_arch_unknown)
|
|
|
|
{
|
|
|
|
abfd->arch_info = &bfd_default_arch_struct;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return bfd_default_set_arch_mach (abfd, arch, mach);
|
|
|
|
}
|
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* We have to save up all the Srecords for a splurge before output. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
|
|
|
|
bfd *abfd;
|
|
|
|
sec_ptr section;
|
|
|
|
PTR location;
|
|
|
|
file_ptr offset;
|
|
|
|
bfd_size_type bytes_to_do;
|
|
|
|
{
|
|
|
|
tdata_type *tdata = abfd->tdata.srec_data;
|
|
|
|
register srec_data_list_type *entry;
|
|
|
|
|
|
|
|
entry = ((srec_data_list_type *)
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_alloc (abfd, (bfd_size_type) sizeof (srec_data_list_type)));
|
1999-05-03 07:29:11 +00:00
|
|
|
if (entry == NULL)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (bytes_to_do
|
|
|
|
&& (section->flags & SEC_ALLOC)
|
|
|
|
&& (section->flags & SEC_LOAD))
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_byte *data;
|
|
|
|
|
|
|
|
data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
|
1999-05-03 07:29:11 +00:00
|
|
|
if (data == NULL)
|
|
|
|
return false;
|
|
|
|
memcpy ((PTR) data, location, (size_t) bytes_to_do);
|
|
|
|
|
2000-11-03 01:47:13 +00:00
|
|
|
/* Ff S3Forced is true then always select S3 records,
|
|
|
|
regardless of the siez of the addresses. */
|
|
|
|
if (S3Forced)
|
|
|
|
tdata->type = 3;
|
2000-12-20 00:21:57 +00:00
|
|
|
else if ((section->lma + offset + bytes_to_do - 1) <= 0xffff)
|
2000-11-03 01:47:13 +00:00
|
|
|
; /* The default, S1, is OK. */
|
1999-05-03 07:29:11 +00:00
|
|
|
else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff
|
|
|
|
&& tdata->type <= 2)
|
2000-11-03 01:47:13 +00:00
|
|
|
tdata->type = 2;
|
1999-05-03 07:29:11 +00:00
|
|
|
else
|
2000-11-03 01:47:13 +00:00
|
|
|
tdata->type = 3;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
entry->data = data;
|
|
|
|
entry->where = section->lma + offset;
|
|
|
|
entry->size = bytes_to_do;
|
|
|
|
|
|
|
|
/* Sort the records by address. Optimize for the common case of
|
|
|
|
adding a record to the end of the list. */
|
|
|
|
if (tdata->tail != NULL
|
|
|
|
&& entry->where >= tdata->tail->where)
|
|
|
|
{
|
|
|
|
tdata->tail->next = entry;
|
|
|
|
entry->next = NULL;
|
|
|
|
tdata->tail = entry;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
register srec_data_list_type **look;
|
|
|
|
|
|
|
|
for (look = &tdata->head;
|
|
|
|
*look != NULL && (*look)->where < entry->where;
|
|
|
|
look = &(*look)->next)
|
|
|
|
;
|
|
|
|
entry->next = *look;
|
|
|
|
*look = entry;
|
|
|
|
if (entry->next == NULL)
|
|
|
|
tdata->tail = entry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
2000-07-06 23:26:55 +00:00
|
|
|
here. */
|
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
static boolean
|
|
|
|
srec_write_record (abfd, type, address, data, end)
|
|
|
|
bfd *abfd;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
unsigned int type;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_vma address;
|
|
|
|
const bfd_byte *data;
|
|
|
|
const bfd_byte *end;
|
|
|
|
{
|
2002-04-04 03:05:51 +00:00
|
|
|
char buffer[2 * MAXCHUNK + 6];
|
1999-05-03 07:29:11 +00:00
|
|
|
unsigned int check_sum = 0;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
const bfd_byte *src = data;
|
1999-05-03 07:29:11 +00:00
|
|
|
char *dst = buffer;
|
|
|
|
char *length;
|
|
|
|
bfd_size_type wrlen;
|
|
|
|
|
|
|
|
*dst++ = 'S';
|
|
|
|
*dst++ = '0' + type;
|
|
|
|
|
|
|
|
length = dst;
|
2000-07-06 23:26:55 +00:00
|
|
|
dst += 2; /* Leave room for dst. */
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case 3:
|
|
|
|
case 7:
|
|
|
|
TOHEX (dst, (address >> 24), check_sum);
|
|
|
|
dst += 2;
|
|
|
|
case 8:
|
|
|
|
case 2:
|
|
|
|
TOHEX (dst, (address >> 16), check_sum);
|
|
|
|
dst += 2;
|
|
|
|
case 9:
|
|
|
|
case 1:
|
|
|
|
case 0:
|
|
|
|
TOHEX (dst, (address >> 8), check_sum);
|
|
|
|
dst += 2;
|
|
|
|
TOHEX (dst, (address), check_sum);
|
|
|
|
dst += 2;
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
for (src = data; src < end; src++)
|
|
|
|
{
|
|
|
|
TOHEX (dst, *src, check_sum);
|
|
|
|
dst += 2;
|
|
|
|
}
|
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Fill in the length. */
|
1999-05-03 07:29:11 +00:00
|
|
|
TOHEX (length, (dst - length) / 2, check_sum);
|
|
|
|
check_sum &= 0xff;
|
|
|
|
check_sum = 255 - check_sum;
|
|
|
|
TOHEX (dst, check_sum, check_sum);
|
|
|
|
dst += 2;
|
|
|
|
|
|
|
|
*dst++ = '\r';
|
|
|
|
*dst++ = '\n';
|
|
|
|
wrlen = dst - buffer;
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
if (bfd_bwrite ((PTR) buffer, wrlen, abfd) != wrlen)
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_write_header (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2002-04-04 03:05:51 +00:00
|
|
|
unsigned int len = strlen (abfd->filename);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* I'll put an arbitary 40 char limit on header size. */
|
2002-04-04 03:05:51 +00:00
|
|
|
if (len > 40)
|
|
|
|
len = 40;
|
2000-07-06 23:26:55 +00:00
|
|
|
|
2002-04-04 03:05:51 +00:00
|
|
|
return srec_write_record (abfd, 0, (bfd_vma) 0,
|
|
|
|
abfd->filename, abfd->filename + len);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_write_section (abfd, tdata, list)
|
|
|
|
bfd *abfd;
|
|
|
|
tdata_type *tdata;
|
|
|
|
srec_data_list_type *list;
|
|
|
|
{
|
2000-01-13 22:10:36 +00:00
|
|
|
unsigned int octets_written = 0;
|
1999-05-03 07:29:11 +00:00
|
|
|
bfd_byte *location = list->data;
|
|
|
|
|
2002-04-04 03:05:51 +00:00
|
|
|
/* Validate number of data bytes to write. The srec length byte
|
|
|
|
counts the address, data and crc bytes. S1 (tdata->type == 1)
|
|
|
|
records have two address bytes, S2 (tdata->type == 2) records
|
|
|
|
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;
|
|
|
|
|
2000-01-13 22:10:36 +00:00
|
|
|
while (octets_written < list->size)
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
bfd_vma address;
|
2000-01-13 22:10:36 +00:00
|
|
|
unsigned int octets_this_chunk = list->size - octets_written;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-11-03 01:47:13 +00:00
|
|
|
if (octets_this_chunk > Chunk)
|
|
|
|
octets_this_chunk = Chunk;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2000-01-13 22:10:36 +00:00
|
|
|
address = list->where + octets_written / bfd_octets_per_byte (abfd);
|
1999-05-03 07:29:11 +00:00
|
|
|
|
|
|
|
if (! srec_write_record (abfd,
|
|
|
|
tdata->type,
|
|
|
|
address,
|
|
|
|
location,
|
2000-01-13 22:10:36 +00:00
|
|
|
location + octets_this_chunk))
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
|
2000-01-13 22:10:36 +00:00
|
|
|
octets_written += octets_this_chunk;
|
|
|
|
location += octets_this_chunk;
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_write_terminator (abfd, tdata)
|
|
|
|
bfd *abfd;
|
|
|
|
tdata_type *tdata;
|
|
|
|
{
|
|
|
|
return srec_write_record (abfd, 10 - tdata->type,
|
2002-04-04 03:05:51 +00:00
|
|
|
abfd->start_address, NULL, NULL);
|
1999-05-03 07:29:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_write_symbols (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Dump out the symbols of a bfd. */
|
1999-05-03 07:29:11 +00:00
|
|
|
int i;
|
|
|
|
int count = bfd_get_symcount (abfd);
|
|
|
|
|
|
|
|
if (count)
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_size_type len;
|
1999-05-03 07:29:11 +00:00
|
|
|
asymbol **table = bfd_get_outsymbols (abfd);
|
2002-04-04 03:05:51 +00:00
|
|
|
len = strlen (abfd->filename);
|
|
|
|
if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3
|
|
|
|
|| bfd_bwrite (abfd->filename, len, abfd) != len
|
|
|
|
|| bfd_bwrite ("\r\n", (bfd_size_type) 2, abfd) != 2)
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
{
|
|
|
|
asymbol *s = table[i];
|
|
|
|
if (! bfd_is_local_label (abfd, s)
|
|
|
|
&& (s->flags & BSF_DEBUGGING) == 0)
|
|
|
|
{
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Just dump out non debug symbols. */
|
2002-04-04 03:05:51 +00:00
|
|
|
char buf[42], *p;
|
|
|
|
|
|
|
|
len = strlen (s->name);
|
|
|
|
if (bfd_bwrite (" ", (bfd_size_type) 2, abfd) != 2
|
|
|
|
|| bfd_bwrite (s->name, len, abfd) != len)
|
|
|
|
return false;
|
1999-05-03 07:29:11 +00:00
|
|
|
|
2002-04-04 03:05:51 +00:00
|
|
|
sprintf_vma (buf + 1, (s->value
|
|
|
|
+ s->section->output_section->lma
|
|
|
|
+ s->section->output_offset));
|
|
|
|
p = buf + 1;
|
1999-05-03 07:29:11 +00:00
|
|
|
while (p[0] == '0' && p[1] != 0)
|
|
|
|
p++;
|
2002-04-04 03:05:51 +00:00
|
|
|
len = strlen (p);
|
|
|
|
p[len] = '\r';
|
|
|
|
p[len + 1] = '\n';
|
|
|
|
*--p = ' ';
|
|
|
|
len += 3;
|
|
|
|
if (bfd_bwrite (p, len, abfd) != len)
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
2002-04-04 03:05:51 +00:00
|
|
|
if (bfd_bwrite ("$$ \r\n", (bfd_size_type) 5, abfd) != 5)
|
1999-05-03 07:29:11 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
internal_srec_write_object_contents (abfd, symbols)
|
|
|
|
bfd *abfd;
|
|
|
|
int symbols;
|
|
|
|
{
|
|
|
|
tdata_type *tdata = abfd->tdata.srec_data;
|
|
|
|
srec_data_list_type *list;
|
|
|
|
|
|
|
|
if (symbols)
|
|
|
|
{
|
|
|
|
if (! srec_write_symbols (abfd))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (! srec_write_header (abfd))
|
|
|
|
return false;
|
|
|
|
|
2000-07-06 23:26:55 +00:00
|
|
|
/* Now wander though all the sections provided and output them. */
|
1999-05-03 07:29:11 +00:00
|
|
|
list = tdata->head;
|
|
|
|
|
|
|
|
while (list != (srec_data_list_type *) NULL)
|
|
|
|
{
|
|
|
|
if (! srec_write_section (abfd, tdata, list))
|
|
|
|
return false;
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
return srec_write_terminator (abfd, tdata);
|
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
srec_write_object_contents (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
|
|
|
return internal_srec_write_object_contents (abfd, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static boolean
|
|
|
|
symbolsrec_write_object_contents (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
|
|
|
return internal_srec_write_object_contents (abfd, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
srec_sizeof_headers (abfd, exec)
|
1999-07-11 19:49:48 +00:00
|
|
|
bfd *abfd ATTRIBUTE_UNUSED;
|
|
|
|
boolean exec ATTRIBUTE_UNUSED;
|
1999-05-03 07:29:11 +00:00
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the amount of memory needed to read the symbol table. */
|
|
|
|
|
|
|
|
static long
|
|
|
|
srec_get_symtab_upper_bound (abfd)
|
|
|
|
bfd *abfd;
|
|
|
|
{
|
|
|
|
return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the symbol table. */
|
|
|
|
|
|
|
|
static long
|
|
|
|
srec_get_symtab (abfd, alocation)
|
|
|
|
bfd *abfd;
|
|
|
|
asymbol **alocation;
|
|
|
|
{
|
Touches most files in bfd/, so likely will be blamed for everything..
o bfd_read and bfd_write lose an unnecessary param and become
bfd_bread and bfd_bwrite.
o bfd_*alloc now all take a bfd_size_type arg, and will error if
size_t is too small. eg. 32 bit host, 64 bit bfd, verrry big files
or bugs in linker scripts etc.
o file_ptr becomes a bfd_signed_vma. Besides matching sizes with
various other types involved in handling sections, this should make
it easier for bfd to support a 64 bit off_t on 32 bit hosts that
provide it.
o I've made the H_GET_* and H_PUT_* macros (which invoke bfd_h_{get,put}_*)
generally available. They now cast their args to bfd_vma and
bfd_byte * as appropriate, which removes a swag of casts from the
source.
o Bug fixes to bfd_get8, aix386_core_vec, elf32_h8_relax_section, and
aout-encap.c.
o Zillions of formatting and -Wconversion fixes.
2001-09-18 09:57:26 +00:00
|
|
|
bfd_size_type symcount = bfd_get_symcount (abfd);
|
1999-05-03 07:29:11 +00:00
|
|
|
asymbol *csymbols;
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
csymbols = abfd->tdata.srec_data->csymbols;
|
|
|
|
if (csymbols == NULL)
|
|
|
|
{
|
|
|
|
asymbol *c;
|
|
|
|
struct srec_symbol *s;
|
|
|
|
|
|
|
|
csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
|
|
|
|
if (csymbols == NULL && symcount != 0)
|
|
|
|
return false;
|
|
|
|
abfd->tdata.srec_data->csymbols = csymbols;
|
|
|
|
|
|
|
|
for (s = abfd->tdata.srec_data->symbols, c = csymbols;
|
|
|
|
s != NULL;
|
|
|
|
s = s->next, ++c)
|
|
|
|
{
|
|
|
|
c->the_bfd = abfd;
|
|
|
|
c->name = s->name;
|
|
|
|
c->value = s->val;
|
|
|
|
c->flags = BSF_GLOBAL;
|
|
|
|
c->section = bfd_abs_section_ptr;
|
|
|
|
c->udata.p = NULL;
|
|
|
|
}
|
|
|
|
}
|
2000-07-06 23:26:55 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
for (i = 0; i < symcount; i++)
|
|
|
|
*alocation++ = csymbols++;
|
|
|
|
*alocation = NULL;
|
|
|
|
|
|
|
|
return symcount;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
srec_get_symbol_info (ignore_abfd, symbol, ret)
|
1999-07-11 19:49:48 +00:00
|
|
|
bfd *ignore_abfd ATTRIBUTE_UNUSED;
|
1999-05-03 07:29:11 +00:00
|
|
|
asymbol *symbol;
|
|
|
|
symbol_info *ret;
|
|
|
|
{
|
|
|
|
bfd_symbol_info (symbol, ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-08-23 15:45:19 +00:00
|
|
|
srec_print_symbol (abfd, afile, symbol, how)
|
|
|
|
bfd *abfd;
|
1999-05-03 07:29:11 +00:00
|
|
|
PTR afile;
|
|
|
|
asymbol *symbol;
|
|
|
|
bfd_print_symbol_type how;
|
|
|
|
{
|
|
|
|
FILE *file = (FILE *) afile;
|
|
|
|
switch (how)
|
|
|
|
{
|
|
|
|
case bfd_print_symbol_name:
|
|
|
|
fprintf (file, "%s", symbol->name);
|
|
|
|
break;
|
|
|
|
default:
|
2001-08-23 15:45:19 +00:00
|
|
|
bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
|
1999-05-03 07:29:11 +00:00
|
|
|
fprintf (file, " %-5s %s",
|
|
|
|
symbol->section->name,
|
|
|
|
symbol->name);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#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_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
|
2002-01-06 07:30:35 +00:00
|
|
|
#define srec_make_empty_symbol _bfd_generic_make_empty_symbol
|
1999-05-03 07:29:11 +00:00
|
|
|
#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_reloc_upper_bound \
|
|
|
|
((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
|
|
|
|
#define srec_canonicalize_reloc \
|
|
|
|
((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
|
|
|
|
#define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
|
|
|
|
|
|
|
|
#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
|
* merge.c (struct sec_merge_hash_entry): Add u.entsize and u.suffix
fields, change sec into secinfo.
(struct sec_merge_info): Add chain, remove last fields.
(struct sec_merge_sec_info): Add next, sec, psecinfo fields.
(sec_merge_hash_lookup): If lookup could not use a string only
because it has bad alignment, mark the old string for deletion.
(sec_merge_add): Add secinfo argument. Don't compute entry's
position, instead record the section.
(sec_merge_emit): Update for the sec into secinfo change in
struct sec_merge_hash_entry.
(_bfd_merge_section): Only record the section for merging, defer
putting strings into the hash table.
(cmplengthentry, last4_eq, last_eq, record_section, merge_strings,
_bfd_merge_sections): New functions.
(_bfd_merged_section_offset): Update for the sec_merge_hash_entry
changes.
* libbfd-in.h (_bfd_merge_sections): Add prototype.
(_bfd_nolink_bfd_merge_sections): Define.
* libbfd.h: Likewise.
(bfd_generic_merge_sections): Add prototype.
* targets.c (BFD_JUMP_TABLE_LINK): Add _bfd_merge_sections.
(struct bfd_target): Likewise.
* bfd.c (bfd_merge_sections): Define.
* bfd-in2.h: Rebuilt.
* elf.c (_bfd_elf_merge_sections): New function.
* elf-bfd.h (_bfd_elf_merge_sections): Add prototype.
* elfxx-target.h (bfd_elfNN_bfd_merge_sections): Define.
* reloc.c (bfd_generic_merge_sections): New function.
* vms.c (vms_bfd_merge_sections): New function.
* aout-adobe.c (aout_32_bfd_merge_sections): Define.
* aout-target.h (MY_bfd_merge_sections): Define.
* aout-tic30.c (MY_bfd_merge_sections): Define.
* binary.c (binary_bfd_merge_sections): Define.
* bout.c (b_out_bfd_merge_sections): Define.
* coff-alpha.c (_bfd_ecoff_bfd_merge_sections): Define.
* coffcode.c (coff_bfd_merge_sections): Define.
* coff-mips.c (_bfd_ecoff_bfd_merge_sections): Define.
* i386msdos.c (msdos_bfd_merge_sections): Define.
* i386os9k.c (os9k_bfd_merge_sections): Define.
* ieee.c (ieee_bfd_merge_sections): Define.
* ihex.c (ihex_bfd_merge_sections): Define.
* nlm-target.h (nlm_bfd_merge_sections): Define.
* oasys.c (oasys_bfd_merge_sections): Define.
* ppcboot.c (ppcboot_bfd_merge_sections): Define.
* som.c (som_bfd_merge_sections): Define.
* srec.c (srec_bfd_merge_sections): Define.
* tekhex.c (tekhex_bfd_merge_sections): Define.
* versados.c (versados_bfd_merge_sections): Define.
* xcoff-target.h (_bfd_xcoff_bfd_merge_sections): Define.
* ldlang.c (lang_process): Call bfd_merge_sections.
2001-05-11 12:23:48 +00:00
|
|
|
#define srec_bfd_merge_sections bfd_generic_merge_sections
|
2002-06-05 03:43:11 +00:00
|
|
|
#define srec_bfd_discard_group bfd_generic_discard_group
|
1999-05-03 07:29:11 +00:00
|
|
|
#define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
|
2002-04-04 19:53:38 +00:00
|
|
|
#define srec_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
|
1999-05-03 07:29:11 +00:00
|
|
|
#define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols
|
2002-05-15 00:18:58 +00:00
|
|
|
#define srec_bfd_link_just_syms _bfd_generic_link_just_syms
|
1999-05-03 07:29:11 +00:00
|
|
|
#define srec_bfd_final_link _bfd_generic_final_link
|
|
|
|
#define srec_bfd_link_split_section _bfd_generic_link_split_section
|
|
|
|
|
|
|
|
const bfd_target srec_vec =
|
|
|
|
{
|
|
|
|
"srec", /* name */
|
|
|
|
bfd_target_srec_flavour,
|
|
|
|
BFD_ENDIAN_UNKNOWN, /* target byte order */
|
|
|
|
BFD_ENDIAN_UNKNOWN, /* target headers byte order */
|
|
|
|
(HAS_RELOC | EXEC_P | /* object flags */
|
|
|
|
HAS_LINENO | HAS_DEBUG |
|
|
|
|
HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
|
|
|
|
(SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
|
|
|
|
| SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
|
|
|
|
0, /* leading underscore */
|
|
|
|
' ', /* ar_pad_char */
|
|
|
|
16, /* ar_max_namelen */
|
|
|
|
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, /* hdrs */
|
|
|
|
|
|
|
|
{
|
|
|
|
_bfd_dummy_target,
|
|
|
|
srec_object_p, /* bfd_check_format */
|
|
|
|
_bfd_dummy_target,
|
|
|
|
_bfd_dummy_target,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
bfd_false,
|
|
|
|
srec_mkobject,
|
|
|
|
_bfd_generic_mkarchive,
|
|
|
|
bfd_false,
|
|
|
|
},
|
|
|
|
{ /* bfd_write_contents */
|
|
|
|
bfd_false,
|
|
|
|
srec_write_object_contents,
|
|
|
|
_bfd_write_archive_contents,
|
|
|
|
bfd_false,
|
|
|
|
},
|
|
|
|
|
|
|
|
BFD_JUMP_TABLE_GENERIC (srec),
|
|
|
|
BFD_JUMP_TABLE_COPY (_bfd_generic),
|
|
|
|
BFD_JUMP_TABLE_CORE (_bfd_nocore),
|
|
|
|
BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
|
|
|
|
BFD_JUMP_TABLE_SYMBOLS (srec),
|
|
|
|
BFD_JUMP_TABLE_RELOCS (srec),
|
|
|
|
BFD_JUMP_TABLE_WRITE (srec),
|
|
|
|
BFD_JUMP_TABLE_LINK (srec),
|
|
|
|
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
|
|
|
|
1999-07-19 14:55:16 +00:00
|
|
|
NULL,
|
2000-07-06 23:26:55 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
(PTR) 0
|
|
|
|
};
|
|
|
|
|
|
|
|
const bfd_target symbolsrec_vec =
|
|
|
|
{
|
|
|
|
"symbolsrec", /* name */
|
|
|
|
bfd_target_srec_flavour,
|
|
|
|
BFD_ENDIAN_UNKNOWN, /* target byte order */
|
|
|
|
BFD_ENDIAN_UNKNOWN, /* target headers byte order */
|
|
|
|
(HAS_RELOC | EXEC_P | /* object flags */
|
|
|
|
HAS_LINENO | HAS_DEBUG |
|
|
|
|
HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
|
|
|
|
(SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
|
|
|
|
| SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
|
|
|
|
0, /* leading underscore */
|
|
|
|
' ', /* ar_pad_char */
|
|
|
|
16, /* ar_max_namelen */
|
|
|
|
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, /* hdrs */
|
|
|
|
|
|
|
|
{
|
|
|
|
_bfd_dummy_target,
|
|
|
|
symbolsrec_object_p, /* bfd_check_format */
|
|
|
|
_bfd_dummy_target,
|
|
|
|
_bfd_dummy_target,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
bfd_false,
|
|
|
|
srec_mkobject,
|
|
|
|
_bfd_generic_mkarchive,
|
|
|
|
bfd_false,
|
|
|
|
},
|
|
|
|
{ /* bfd_write_contents */
|
|
|
|
bfd_false,
|
|
|
|
symbolsrec_write_object_contents,
|
|
|
|
_bfd_write_archive_contents,
|
|
|
|
bfd_false,
|
|
|
|
},
|
|
|
|
|
|
|
|
BFD_JUMP_TABLE_GENERIC (srec),
|
|
|
|
BFD_JUMP_TABLE_COPY (_bfd_generic),
|
|
|
|
BFD_JUMP_TABLE_CORE (_bfd_nocore),
|
|
|
|
BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
|
|
|
|
BFD_JUMP_TABLE_SYMBOLS (srec),
|
|
|
|
BFD_JUMP_TABLE_RELOCS (srec),
|
|
|
|
BFD_JUMP_TABLE_WRITE (srec),
|
|
|
|
BFD_JUMP_TABLE_LINK (srec),
|
|
|
|
BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
|
|
|
|
|
1999-07-19 14:55:16 +00:00
|
|
|
NULL,
|
2000-07-06 23:26:55 +00:00
|
|
|
|
1999-05-03 07:29:11 +00:00
|
|
|
(PTR) 0
|
|
|
|
};
|