summaryrefslogtreecommitdiff
path: root/bfd/nlm32-sparc.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2001-09-18 09:57:26 +0000
committerAlan Modra <amodra@bigpond.net.au>2001-09-18 09:57:26 +0000
commit439c22790eb92fc38c0c4e91bc343ef8d0e55427 (patch)
treeeb49f3489bb7e104ca1c425d07d5d954ab03148f /bfd/nlm32-sparc.c
parent8ff532ca9bf72656df68051c20729d9fdec919b9 (diff)
downloadgdb-439c22790eb92fc38c0c4e91bc343ef8d0e55427.tar.gz
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.
Diffstat (limited to 'bfd/nlm32-sparc.c')
-rw-r--r--bfd/nlm32-sparc.c33
1 files changed, 17 insertions, 16 deletions
diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
index 6048cb5ba7a..0246dd2402a 100644
--- a/bfd/nlm32-sparc.c
+++ b/bfd/nlm32-sparc.c
@@ -62,7 +62,7 @@ enum reloc_type
};
#if 0
-static CONST char *CONST reloc_type_names[] =
+static const char *const reloc_type_names[] =
{
"R_SPARC_NONE",
"R_SPARC_8", "R_SPARC_16", "R_SPARC_32",
@@ -131,7 +131,7 @@ nlm_sparc_read_reloc (abfd, sym, secp, rel)
struct nlm32_sparc_reloc_ext tmp_reloc;
asection *code_sec, *data_sec;
- if (bfd_read (&tmp_reloc, 12, 1, abfd) != 12)
+ if (bfd_bread (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
return false;
code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
@@ -224,7 +224,7 @@ nlm_sparc_write_reloc (abfd, sec, rel)
bfd_put_32 (abfd, rel->addend, tmp_reloc.addend);
bfd_put_8 (abfd, (short) (rel->howto->type), tmp_reloc.type);
- if (bfd_write (&tmp_reloc, 12, 1, abfd) != 12)
+ if (bfd_bwrite (&tmp_reloc, (bfd_size_type) 12, abfd) != 12)
return false;
return true;
@@ -259,24 +259,24 @@ nlm_sparc_read_import (abfd, sym)
/* First, read in the number of relocation
entries for this symbol. */
- if (bfd_read ((PTR) temp, 4, 1, abfd) != 4)
+ if (bfd_bread ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
return false;
rcount = bfd_get_32 (abfd, temp);
/* Next, read in the length of the symbol. */
- if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
+ if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
!= sizeof (symlength))
return false;
sym -> symbol.the_bfd = abfd;
- name = bfd_alloc (abfd, symlength + 1);
+ name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
if (name == NULL)
return false;
/* Then read in the symbol. */
- if (bfd_read (name, symlength, 1, abfd) != symlength)
+ if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
return false;
name[symlength] = '\0';
sym -> symbol.name = name;
@@ -337,10 +337,10 @@ nlm_sparc_write_import (abfd, sec, rel)
__FUNCTION__, base + (*rel->sym_ptr_ptr)->value);
#endif
bfd_put_32 (abfd, base + (*rel->sym_ptr_ptr)->value, temp);
- if (bfd_write ((PTR)temp, 4, 1, abfd) != 4)
+ if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
return false;
- bfd_put_32 (abfd, 1, temp);
- if (bfd_write ((PTR)temp, 4, 1, abfd) != 4)
+ bfd_put_32 (abfd, (bfd_vma) 1, temp);
+ if (bfd_bwrite ((PTR) temp, (bfd_size_type) 4, abfd) != 4)
return false;
if (nlm_sparc_write_reloc (abfd, sec, rel) == false)
return false;
@@ -361,12 +361,13 @@ nlm_sparc_write_external (abfd, count, sym, relocs)
unsigned char temp[NLM_TARGET_LONG_SIZE];
bfd_put_32 (abfd, count, temp);
- if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
+ if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
return false;
len = strlen (sym->name);
- if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof (bfd_byte))
- || bfd_write (sym->name, len, 1, abfd) != len)
+ if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+ != sizeof (bfd_byte))
+ || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
return false;
for (i = 0; i < count; i++)
@@ -395,9 +396,9 @@ nlm_sparc_write_export (abfd, sym, value)
bfd_put_32 (abfd, value, temp);
len = strlen (sym->name);
- if (bfd_write (temp, 4, 1, abfd) != 4
- || bfd_write (&len, 1, 1, abfd) != 1
- || bfd_write (sym->name, len, 1, abfd) != len)
+ if (bfd_bwrite (temp, (bfd_size_type) 4, abfd) != 4
+ || bfd_bwrite (&len, (bfd_size_type) 1, abfd) != 1
+ || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
return false;
return true;