mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-28 18:10:46 +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.
This commit is contained in:
@@ -301,10 +301,10 @@ MY (write_object_contents) (abfd)
|
||||
/* update fields not covered by default swap_exec_header_out */
|
||||
|
||||
/* this is really the sym table size but we store it in drelocs */
|
||||
bfd_h_put_32 (abfd, bfd_get_symcount (abfd) * 12, exec_bytes.e_drelocs);
|
||||
H_PUT_32 (abfd, (bfd_get_symcount (abfd) * 12), exec_bytes.e_drelocs);
|
||||
|
||||
if (bfd_seek (abfd, 0L, false) != 0
|
||||
|| (bfd_write ((PTR) & exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
|
||||
if (bfd_seek (abfd, (file_ptr) 0, false) != 0
|
||||
|| (bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, abfd)
|
||||
!= EXEC_BYTES_SIZE))
|
||||
return false;
|
||||
|
||||
@@ -314,7 +314,7 @@ MY (write_object_contents) (abfd)
|
||||
if (bfd_get_symcount (abfd) != 0)
|
||||
{
|
||||
/* Skip the relocs to where we want to put the symbols. */
|
||||
if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp) + execp->a_drsize,
|
||||
if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp) + execp->a_drsize),
|
||||
SEEK_SET) != 0)
|
||||
return false;
|
||||
}
|
||||
@@ -324,11 +324,11 @@ MY (write_object_contents) (abfd)
|
||||
|
||||
if (bfd_get_symcount (abfd) != 0)
|
||||
{
|
||||
if (bfd_seek (abfd, (long) (N_TRELOFF (*execp)), false) != 0)
|
||||
if (bfd_seek (abfd, (file_ptr) N_TRELOFF (*execp), SEEK_CUR) != 0)
|
||||
return false;
|
||||
if (!NAME (aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
|
||||
return false;
|
||||
if (bfd_seek (abfd, (long) (N_DRELOFF (*execp)), false) != 0)
|
||||
if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp), SEEK_CUR) != 0)
|
||||
return false;
|
||||
if (!NAME (aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
|
||||
return false;
|
||||
@@ -449,7 +449,7 @@ NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
|
||||
are memcmp'd, and thus the contents do matter. */
|
||||
memset (execp, 0, sizeof (struct internal_exec));
|
||||
/* Now fill in fields in the execp, from the bytes in the raw data. */
|
||||
execp->a_info = bfd_h_get_32 (abfd, bytes->e_info);
|
||||
execp->a_info = H_GET_32 (abfd, bytes->e_info);
|
||||
execp->a_text = GET_WORD (abfd, bytes->e_text);
|
||||
execp->a_data = GET_WORD (abfd, bytes->e_data);
|
||||
execp->a_bss = GET_WORD (abfd, bytes->e_bss);
|
||||
@@ -468,14 +468,16 @@ NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
|
||||
{
|
||||
long syms;
|
||||
struct aout_data_struct *rawptr;
|
||||
if (bfd_h_get_32 (abfd, bytes->e_passize) != 0)
|
||||
bfd_size_type amt;
|
||||
|
||||
if (H_GET_32 (abfd, bytes->e_passize) != 0)
|
||||
break;
|
||||
if (bfd_h_get_32 (abfd, bytes->e_syms) != 0)
|
||||
if (H_GET_32 (abfd, bytes->e_syms) != 0)
|
||||
break;
|
||||
if (bfd_h_get_32 (abfd, bytes->e_supsize) != 0)
|
||||
if (H_GET_32 (abfd, bytes->e_supsize) != 0)
|
||||
break;
|
||||
|
||||
syms = bfd_h_get_32 (abfd, bytes->e_drelocs);
|
||||
syms = H_GET_32 (abfd, bytes->e_drelocs);
|
||||
if (syms == 0)
|
||||
break;
|
||||
|
||||
@@ -483,7 +485,8 @@ NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
|
||||
execp->a_syms = syms;
|
||||
|
||||
/* allocate storage for where we will store this result */
|
||||
rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, sizeof (*rawptr));
|
||||
amt = sizeof (*rawptr);
|
||||
rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, amt);
|
||||
|
||||
if (rawptr == NULL)
|
||||
return;
|
||||
@@ -527,19 +530,20 @@ MY (slurp_symbol_table) (abfd)
|
||||
char *strings;
|
||||
aout_symbol_type *cached;
|
||||
unsigned num_syms = 0;
|
||||
bfd_size_type amt;
|
||||
|
||||
/* If there's no work to be done, don't do any */
|
||||
if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
|
||||
return true;
|
||||
symbol_bytes = exec_hdr (abfd)->a_syms;
|
||||
|
||||
strings = (char *) bfd_alloc (abfd,
|
||||
symbol_bytes + SYM_EXTRA_BYTES);
|
||||
amt = symbol_bytes + SYM_EXTRA_BYTES;
|
||||
strings = (char *) bfd_alloc (abfd, amt);
|
||||
if (!strings)
|
||||
return false;
|
||||
syms = (struct external_nlist *) (strings + SYM_EXTRA_BYTES);
|
||||
if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
|
||||
|| bfd_read ((PTR) syms, symbol_bytes, 1, abfd) != symbol_bytes)
|
||||
|| bfd_bread ((PTR) syms, symbol_bytes, abfd) != symbol_bytes)
|
||||
{
|
||||
bfd_release (abfd, syms);
|
||||
return false;
|
||||
@@ -558,10 +562,10 @@ MY (slurp_symbol_table) (abfd)
|
||||
/* now that we know the symbol count, update the bfd header */
|
||||
bfd_get_symcount (abfd) = num_syms;
|
||||
|
||||
cached = ((aout_symbol_type *)
|
||||
bfd_zalloc (abfd,
|
||||
bfd_get_symcount (abfd) * sizeof (aout_symbol_type)));
|
||||
if (cached == NULL && bfd_get_symcount (abfd) != 0)
|
||||
amt = num_syms;
|
||||
amt *= sizeof (aout_symbol_type);
|
||||
cached = (aout_symbol_type *) bfd_zalloc (abfd, amt);
|
||||
if (cached == NULL && num_syms != 0)
|
||||
return false;
|
||||
|
||||
/* as we march thru the hp symbol table, convert it into a list of
|
||||
@@ -635,8 +639,8 @@ MY (swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
|
||||
int r_pcrel = 0;
|
||||
struct aoutdata *su = &(abfd->tdata.aout_data->a);
|
||||
|
||||
cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
|
||||
r_index = bfd_h_get_16 (abfd, bytes->r_index);
|
||||
cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
|
||||
r_index = H_GET_16 (abfd, bytes->r_index);
|
||||
|
||||
switch (bytes->r_type[0])
|
||||
{
|
||||
@@ -706,7 +710,7 @@ MY (slurp_reloc_table) (abfd, asect, symbols)
|
||||
sec_ptr asect;
|
||||
asymbol **symbols;
|
||||
{
|
||||
unsigned int count;
|
||||
bfd_size_type count;
|
||||
bfd_size_type reloc_size;
|
||||
PTR relocs;
|
||||
arelent *reloc_cache;
|
||||
@@ -743,8 +747,7 @@ doit:
|
||||
|
||||
count = reloc_size / each_size;
|
||||
|
||||
reloc_cache = (arelent *) bfd_zalloc (abfd, (size_t) (count * sizeof
|
||||
(arelent)));
|
||||
reloc_cache = (arelent *) bfd_zalloc (abfd, count * sizeof (arelent));
|
||||
if (!reloc_cache && count != 0)
|
||||
return false;
|
||||
|
||||
@@ -755,7 +758,7 @@ doit:
|
||||
return false;
|
||||
}
|
||||
|
||||
if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
|
||||
if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
|
||||
{
|
||||
bfd_release (abfd, relocs);
|
||||
bfd_release (abfd, reloc_cache);
|
||||
@@ -769,7 +772,7 @@ doit:
|
||||
for (; counter < count; counter++, rptr++, cache_ptr++)
|
||||
{
|
||||
MY (swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
|
||||
bfd_get_symcount (abfd));
|
||||
(bfd_size_type) bfd_get_symcount (abfd));
|
||||
}
|
||||
|
||||
bfd_release (abfd, relocs);
|
||||
|
||||
Reference in New Issue
Block a user