mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-09-10 03:42:22 +08: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.
This commit is contained in:
@ -47,7 +47,7 @@ static boolean versados_mkobject PARAMS ((bfd *));
|
||||
static boolean versados_scan PARAMS ((bfd *));
|
||||
static const bfd_target *versados_object_p PARAMS ((bfd *));
|
||||
static asymbol *versados_new_symbol PARAMS ((bfd *, int, const char *, bfd_vma, asection *));
|
||||
static char *new_symbol_string PARAMS ((bfd *, char *));
|
||||
static char *new_symbol_string PARAMS ((bfd *, const char *));
|
||||
static const bfd_target *versados_object_p PARAMS ((bfd *));
|
||||
static boolean versados_pass_2 PARAMS ((bfd *));
|
||||
static boolean versados_get_section_contents
|
||||
@ -58,6 +58,14 @@ static int versados_sizeof_headers PARAMS ((bfd *, boolean));
|
||||
static asymbol *versados_make_empty_symbol PARAMS ((bfd *));
|
||||
static long int versados_get_symtab_upper_bound PARAMS ((bfd *));
|
||||
static long int versados_get_symtab PARAMS ((bfd *, asymbol **));
|
||||
static void versados_get_symbol_info
|
||||
PARAMS ((bfd *, asymbol *, symbol_info *));
|
||||
static void versados_print_symbol
|
||||
PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
|
||||
static long versados_get_reloc_upper_bound
|
||||
PARAMS ((bfd *, sec_ptr));
|
||||
static long versados_canonicalize_reloc
|
||||
PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
|
||||
|
||||
#define VHEADER '1'
|
||||
#define VESTDEF '2'
|
||||
@ -170,7 +178,8 @@ versados_mkobject (abfd)
|
||||
{
|
||||
if (abfd->tdata.versados_data == NULL)
|
||||
{
|
||||
tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
|
||||
bfd_size_type amt = sizeof (tdata_type);
|
||||
tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, amt);
|
||||
if (tdata == NULL)
|
||||
return false;
|
||||
abfd->tdata.versados_data = tdata;
|
||||
@ -208,8 +217,9 @@ get_record (abfd, ptr)
|
||||
bfd *abfd;
|
||||
union ext_any *ptr;
|
||||
{
|
||||
bfd_read (&ptr->size, 1, 1, abfd);
|
||||
if (bfd_read ((char *) ptr + 1, 1, ptr->size, abfd) != ptr->size)
|
||||
if (bfd_bread (&ptr->size, (bfd_size_type) 1, abfd) != 1
|
||||
|| (bfd_bread ((char *) ptr + 1, (bfd_size_type) ptr->size, abfd)
|
||||
!= ptr->size))
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
@ -243,7 +253,7 @@ get_10 (pp, name)
|
||||
static char *
|
||||
new_symbol_string (abfd, name)
|
||||
bfd *abfd;
|
||||
char *name;
|
||||
const char *name;
|
||||
{
|
||||
char *n = VDATA (abfd)->strings;
|
||||
strcpy (VDATA (abfd)->strings, name);
|
||||
@ -294,8 +304,8 @@ process_esd (abfd, esd, pass)
|
||||
int esidx;
|
||||
asymbol *s;
|
||||
char *n = new_symbol_string (abfd, name);
|
||||
s = versados_new_symbol (abfd, snum, n, 0,
|
||||
&bfd_und_section);
|
||||
s = versados_new_symbol (abfd, snum, n, (bfd_vma) 0,
|
||||
bfd_und_section_ptr);
|
||||
esidx = VDATA (abfd)->es_done++;
|
||||
RDATA (abfd, esidx - ES_BASE) = s;
|
||||
}
|
||||
@ -318,7 +328,7 @@ process_esd (abfd, esd, pass)
|
||||
case ESD_XDEF_IN_SEC:
|
||||
{
|
||||
int snum = VDATA (abfd)->def_idx++;
|
||||
long val;
|
||||
bfd_vma val;
|
||||
get_10 (&ptr, name);
|
||||
val = get_4 (&ptr);
|
||||
if (pass == 1)
|
||||
@ -330,7 +340,8 @@ process_esd (abfd, esd, pass)
|
||||
{
|
||||
asymbol *s;
|
||||
char *n = new_symbol_string (abfd, name);
|
||||
s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n, val, sec);
|
||||
s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n,
|
||||
val, sec);
|
||||
s->flags |= BSF_GLOBAL;
|
||||
}
|
||||
}
|
||||
@ -399,7 +410,7 @@ process_otr (abfd, otr, pass)
|
||||
int need_contents = 0;
|
||||
unsigned int dst_idx = esdid->pc;
|
||||
|
||||
for (shift = (1 << 31); shift && srcp < endp; shift >>= 1)
|
||||
for (shift = ((unsigned long) 1 << 31); shift && srcp < endp; shift >>= 1)
|
||||
{
|
||||
if (bits & shift)
|
||||
{
|
||||
@ -472,8 +483,10 @@ process_otr (abfd, otr, pass)
|
||||
EDATA (abfd, otr->esdid - 1).pc = dst_idx;
|
||||
|
||||
if (!contents && need_contents)
|
||||
esdid->contents = (unsigned char *) bfd_alloc (abfd, esdid->section->_raw_size);
|
||||
|
||||
{
|
||||
bfd_size_type size = esdid->section->_raw_size;
|
||||
esdid->contents = (unsigned char *) bfd_alloc (abfd, size);
|
||||
}
|
||||
}
|
||||
|
||||
static boolean
|
||||
@ -484,6 +497,7 @@ versados_scan (abfd)
|
||||
int i;
|
||||
int j;
|
||||
int nsecs = 0;
|
||||
bfd_size_type amt;
|
||||
|
||||
VDATA (abfd)->stringlen = 0;
|
||||
VDATA (abfd)->nrefs = 0;
|
||||
@ -527,8 +541,8 @@ versados_scan (abfd)
|
||||
struct esdid *esdid = &EDATA (abfd, i);
|
||||
if (esdid->section)
|
||||
{
|
||||
esdid->section->relocation
|
||||
= (arelent *) bfd_alloc (abfd, sizeof (arelent) * esdid->relocs);
|
||||
amt = (bfd_size_type) esdid->relocs * sizeof (arelent);
|
||||
esdid->section->relocation = (arelent *) bfd_alloc (abfd, amt);
|
||||
|
||||
esdid->pc = 0;
|
||||
|
||||
@ -549,10 +563,12 @@ versados_scan (abfd)
|
||||
|
||||
abfd->symcount += nsecs;
|
||||
|
||||
VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd,
|
||||
sizeof (asymbol) * (abfd->symcount));
|
||||
amt = abfd->symcount;
|
||||
amt *= sizeof (asymbol);
|
||||
VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd, amt);
|
||||
|
||||
VDATA (abfd)->strings = bfd_alloc (abfd, VDATA (abfd)->stringlen);
|
||||
amt = VDATA (abfd)->stringlen;
|
||||
VDATA (abfd)->strings = bfd_alloc (abfd, amt);
|
||||
|
||||
if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0)
|
||||
|| (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0))
|
||||
@ -600,14 +616,14 @@ versados_object_p (abfd)
|
||||
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
|
||||
return NULL;
|
||||
|
||||
if (bfd_read (&len, 1, 1, abfd) != 1)
|
||||
if (bfd_bread (&len, (bfd_size_type) 1, abfd) != 1)
|
||||
{
|
||||
if (bfd_get_error () != bfd_error_system_call)
|
||||
bfd_set_error (bfd_error_wrong_format);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (bfd_read (&ext.type, 1, len, abfd) != len)
|
||||
if (bfd_bread (&ext.type, (bfd_size_type) len, abfd) != len)
|
||||
{
|
||||
if (bfd_get_error () != bfd_error_system_call)
|
||||
bfd_set_error (bfd_error_wrong_format);
|
||||
@ -642,7 +658,7 @@ versados_pass_2 (abfd)
|
||||
if (VDATA (abfd)->pass_2_done)
|
||||
return 1;
|
||||
|
||||
if (bfd_seek (abfd, 0, SEEK_SET) != 0)
|
||||
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
|
||||
return 0;
|
||||
|
||||
VDATA (abfd)->es_done = ES_BASE;
|
||||
@ -711,7 +727,9 @@ static asymbol *
|
||||
versados_make_empty_symbol (abfd)
|
||||
bfd *abfd;
|
||||
{
|
||||
asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
|
||||
asymbol *new;
|
||||
|
||||
new = (asymbol *) bfd_zalloc (abfd, (bfd_size_type) sizeof (asymbol));
|
||||
if (new)
|
||||
new->the_bfd = abfd;
|
||||
return new;
|
||||
@ -751,7 +769,7 @@ versados_get_symtab (abfd, alocation)
|
||||
return symcount;
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
versados_get_symbol_info (ignore_abfd, symbol, ret)
|
||||
bfd *ignore_abfd ATTRIBUTE_UNUSED;
|
||||
asymbol *symbol;
|
||||
@ -760,7 +778,7 @@ versados_get_symbol_info (ignore_abfd, symbol, ret)
|
||||
bfd_symbol_info (symbol, ret);
|
||||
}
|
||||
|
||||
void
|
||||
static void
|
||||
versados_print_symbol (abfd, afile, symbol, how)
|
||||
bfd *abfd;
|
||||
PTR afile;
|
||||
@ -782,7 +800,7 @@ versados_print_symbol (abfd, afile, symbol, how)
|
||||
}
|
||||
}
|
||||
|
||||
long
|
||||
static long
|
||||
versados_get_reloc_upper_bound (abfd, asect)
|
||||
bfd *abfd ATTRIBUTE_UNUSED;
|
||||
sec_ptr asect;
|
||||
@ -790,7 +808,7 @@ versados_get_reloc_upper_bound (abfd, asect)
|
||||
return (asect->reloc_count + 1) * sizeof (arelent *);
|
||||
}
|
||||
|
||||
long
|
||||
static long
|
||||
versados_canonicalize_reloc (abfd, section, relptr, symbols)
|
||||
bfd *abfd;
|
||||
sec_ptr section;
|
||||
|
Reference in New Issue
Block a user