/* BFD back-end for VERSAdos-E objects.
- Copyright 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
Versados is a Motorola trademark.
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
static boolean versados_set_section_contents
PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
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'
{
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;
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;
}
static char *
new_symbol_string (abfd, name)
bfd *abfd;
- char *name;
+ const char *name;
{
char *n = VDATA (abfd)->strings;
strcpy (VDATA (abfd)->strings, name);
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;
}
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)
{
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;
}
}
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)
{
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
int i;
int j;
int nsecs = 0;
+ bfd_size_type amt;
VDATA (abfd)->stringlen = 0;
VDATA (abfd)->nrefs = 0;
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;
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))
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);
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;
return 0;
}
-static asymbol *
-versados_make_empty_symbol (abfd)
- bfd *abfd;
-{
- asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
- if (new)
- new->the_bfd = abfd;
- return new;
-}
-
/* Return the amount of memory needed to read the symbol table. */
static long
return symcount;
}
-void
+static void
versados_get_symbol_info (ignore_abfd, symbol, ret)
bfd *ignore_abfd ATTRIBUTE_UNUSED;
asymbol *symbol;
bfd_symbol_info (symbol, ret);
}
-void
+static void
versados_print_symbol (abfd, afile, symbol, how)
bfd *abfd;
PTR afile;
}
}
-long
+static long
versados_get_reloc_upper_bound (abfd, asect)
bfd *abfd ATTRIBUTE_UNUSED;
sec_ptr asect;
return (asect->reloc_count + 1) * sizeof (arelent *);
}
-long
+static long
versados_canonicalize_reloc (abfd, section, relptr, symbols)
bfd *abfd;
sec_ptr section;
#define versados_bfd_is_local_label_name bfd_generic_is_local_label_name
#define versados_get_lineno _bfd_nosymbols_get_lineno
#define versados_find_nearest_line _bfd_nosymbols_find_nearest_line
+#define versados_make_empty_symbol _bfd_generic_make_empty_symbol
#define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
#define versados_read_minisymbols _bfd_generic_read_minisymbols
#define versados_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
#define versados_bfd_gc_sections bfd_generic_gc_sections
#define versados_bfd_merge_sections bfd_generic_merge_sections
#define versados_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define versados_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
#define versados_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define versados_bfd_link_just_syms _bfd_generic_link_just_syms
#define versados_bfd_final_link _bfd_generic_final_link
#define versados_bfd_link_split_section _bfd_generic_link_split_section