/* BFD back-end for oasys objects.
- Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+ Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2001, 2002
+ Free Software Foundation, Inc.
-This file is part of BFD, the Binary File Descriptor library.
+ 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 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.
+ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ 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. */
#define UNDERSCORE_HACK 1
#include "bfd.h"
#include "sysdep.h"
+#include "safe-ctype.h"
#include "libbfd.h"
#include "oasys.h"
#include "liboasys.h"
-/* XXX - FIXME. offsetof belongs in the system-specific files in
- ../include/sys. */
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier)
-#endif
-
-static boolean oasys_read_record PARAMS ((bfd *,
- oasys_record_union_type *));
-static boolean oasys_write_sections PARAMS ((bfd *));
-static boolean oasys_write_record PARAMS ((bfd *,
- oasys_record_enum_type,
- oasys_record_union_type *,
- size_t));
-static boolean oasys_write_syms PARAMS ((bfd *));
-static boolean oasys_write_header PARAMS ((bfd *));
-static boolean oasys_write_end PARAMS ((bfd *));
-static boolean oasys_write_data PARAMS ((bfd *));
-
-/* Read in all the section data and relocation stuff too */
-PROTO (static boolean, oasys_slurp_section_data, (bfd * CONST abfd));
-
-static boolean
+static bfd_boolean oasys_slurp_section_data
+ PARAMS ((bfd * const));
+static bfd_boolean oasys_read_record
+ PARAMS ((bfd *, oasys_record_union_type *));
+static bfd_boolean oasys_write_sections
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_record
+ PARAMS ((bfd *, oasys_record_enum_type, oasys_record_union_type *, size_t));
+static bfd_boolean oasys_write_syms
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_header
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_end
+ PARAMS ((bfd *));
+static bfd_boolean oasys_write_data
+ PARAMS ((bfd *));
+static size_t oasys_string_length
+ PARAMS ((oasys_record_union_type *));
+static bfd_boolean oasys_slurp_symbol_table
+ PARAMS ((bfd *const));
+static long int oasys_get_symtab_upper_bound
+ PARAMS ((bfd *const));
+static const bfd_target *oasys_archive_p
+ PARAMS ((bfd *));
+static bfd_boolean oasys_mkobject
+ PARAMS ((bfd *));
+static const bfd_target *oasys_object_p
+ PARAMS ((bfd *));
+static void oasys_get_symbol_info
+ PARAMS ((bfd *, asymbol *, symbol_info *));
+static void oasys_print_symbol
+ PARAMS ((bfd *, void *, asymbol *, bfd_print_symbol_type));
+static bfd_boolean oasys_new_section_hook
+ PARAMS ((bfd *, asection *));
+static long int oasys_get_reloc_upper_bound
+ PARAMS ((bfd *, sec_ptr));
+static bfd_boolean oasys_get_section_contents
+ PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+static int comp
+ PARAMS ((const void *, const void *));
+static bfd_boolean oasys_write_object_contents
+ PARAMS ((bfd *));
+static bfd_boolean oasys_set_section_contents
+ PARAMS ((bfd *, sec_ptr, void *, file_ptr, bfd_size_type));
+static asymbol *oasys_make_empty_symbol
+ PARAMS ((bfd *));
+static bfd *oasys_openr_next_archived_file
+ PARAMS ((bfd *, bfd *));
+static bfd_boolean oasys_find_nearest_line
+ PARAMS ((bfd *, asection *, asymbol **, bfd_vma,
+ const char **, const char **, unsigned int *));
+static int oasys_generic_stat_arch_elt
+ PARAMS ((bfd *, struct stat *));
+static int oasys_sizeof_headers
+ PARAMS ((bfd *, bfd_boolean));
+
+long oasys_get_symtab
+ PARAMS ((bfd *, asymbol **));
+long oasys_canonicalize_reloc
+ PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
+/* Read in all the section data and relocation stuff too. */
+
+static bfd_boolean
oasys_read_record (abfd, record)
bfd *abfd;
oasys_record_union_type *record;
{
- if (bfd_read ((PTR) record, 1, sizeof (record->header), abfd)
- != sizeof (record->header))
- return false;
-
- if ((size_t) record->header.length <= (size_t) sizeof (record->header))
- return true;
- if (bfd_read ((PTR) (((char *) record) + sizeof (record->header)),
- 1, record->header.length - sizeof (record->header),
- abfd)
- != record->header.length - sizeof (record->header))
- return false;
- return true;
+ bfd_size_type amt = sizeof (record->header);
+ if (bfd_bread ((PTR) record, amt, abfd) != amt)
+ return FALSE;
+
+ amt = record->header.length - sizeof (record->header);
+ if ((long) amt <= 0)
+ return TRUE;
+ if (bfd_bread ((PTR) ((char *) record + sizeof (record->header)), amt, abfd)
+ != amt)
+ return FALSE;
+ return TRUE;
}
+
static size_t
oasys_string_length (record)
oasys_record_union_type *record;
*/
-static boolean
+static bfd_boolean
oasys_slurp_symbol_table (abfd)
- bfd *CONST abfd;
+ bfd *const abfd;
{
oasys_record_union_type record;
oasys_data_type *data = OASYS_DATA (abfd);
- boolean loop = true;
+ bfd_boolean loop = TRUE;
asymbol *dest_defined;
asymbol *dest;
char *string_ptr;
-
+ bfd_size_type amt;
if (data->symbols != (asymbol *) NULL)
{
- return true;
+ return TRUE;
}
/* Buy enough memory for all the symbols and all the names */
- data->symbols =
- (asymbol *) bfd_alloc (abfd, sizeof (asymbol) * abfd->symcount);
+ amt = abfd->symcount;
+ amt *= sizeof (asymbol);
+ data->symbols = (asymbol *) bfd_alloc (abfd, amt);
+
+ amt = data->symbol_string_length;
#ifdef UNDERSCORE_HACK
/* buy 1 more char for each symbol to keep the underscore in*/
- data->strings = bfd_alloc (abfd, data->symbol_string_length +
- abfd->symcount);
-#else
- data->strings = bfd_alloc (abfd, data->symbol_string_length);
+ amt += abfd->symcount;
#endif
+ data->strings = bfd_alloc (abfd, amt);
+
if (!data->symbols || !data->strings)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
+ return FALSE;
dest_defined = data->symbols + abfd->symcount - 1;
string_ptr = data->strings;
if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
- return false;
+ return FALSE;
while (loop)
{
if (! oasys_read_record (abfd, &record))
- return false;
+ return FALSE;
switch (record.header.type)
{
case oasys_record_is_header_enum:
{
case RELOCATION_TYPE_ABS:
dest = dest_defined--;
- dest->section = &bfd_abs_section;
+ dest->section = bfd_abs_section_ptr;
dest->flags = 0;
break;
}
break;
case RELOCATION_TYPE_UND:
- dest = data->symbols + bfd_h_get_16 (abfd, record.symbol.refno);
- dest->section = &bfd_und_section;
+ dest = data->symbols + H_GET_16 (abfd, record.symbol.refno);
+ dest->section = bfd_und_section_ptr;
break;
case RELOCATION_TYPE_COM:
dest = dest_defined--;
dest->name = string_ptr;
dest->the_bfd = abfd;
- dest->section = &bfd_com_section;
+ dest->section = bfd_com_section_ptr;
break;
default:
}
dest->name = string_ptr;
dest->the_bfd = abfd;
- dest->udata = (PTR) NULL;
- dest->value = bfd_h_get_32 (abfd, record.symbol.value);
+ dest->udata.p = (PTR) NULL;
+ dest->value = H_GET_32 (abfd, record.symbol.value);
#ifdef UNDERSCORE_HACK
if (record.symbol.name[0] != '_')
}
break;
default:
- loop = false;
+ loop = FALSE;
}
}
- return true;
+ return TRUE;
}
static long
oasys_get_symtab_upper_bound (abfd)
- bfd *CONST abfd;
+ bfd *const abfd;
{
if (! oasys_slurp_symbol_table (abfd))
return -1;
return (abfd->symcount + 1) * (sizeof (oasys_symbol_type *));
}
-/*
-*/
-
-extern bfd_target oasys_vec;
+extern const bfd_target oasys_vec;
long
oasys_get_symtab (abfd, location)
{
asymbol *symbase;
unsigned int counter;
- if (oasys_slurp_symbol_table (abfd) == false)
+ if (! oasys_slurp_symbol_table (abfd))
{
return -1;
}
* archive stuff
*/
-static bfd_target *
+static const bfd_target *
oasys_archive_p (abfd)
bfd *abfd;
{
oasys_extarchive_header_type header_ext;
unsigned int i;
file_ptr filepos;
+ bfd_size_type amt;
- if (bfd_seek (abfd, (file_ptr) 0, false) != 0
- || (bfd_read ((PTR) & header_ext, 1, sizeof (header_ext), abfd)
- != sizeof (header_ext)))
+ amt = sizeof (header_ext);
+ if (bfd_seek (abfd, (file_ptr) 0, 0) != 0
+ || bfd_bread ((PTR) &header_ext, amt, abfd) != amt)
{
if (bfd_get_error () != bfd_error_system_call)
bfd_set_error (bfd_error_wrong_format);
return NULL;
}
- header.version = bfd_h_get_32 (abfd, header_ext.version);
- header.mod_count = bfd_h_get_32 (abfd, header_ext.mod_count);
- header.mod_tbl_offset = bfd_h_get_32 (abfd, header_ext.mod_tbl_offset);
- header.sym_tbl_size = bfd_h_get_32 (abfd, header_ext.sym_tbl_size);
- header.sym_count = bfd_h_get_32 (abfd, header_ext.sym_count);
- header.sym_tbl_offset = bfd_h_get_32 (abfd, header_ext.sym_tbl_offset);
- header.xref_count = bfd_h_get_32 (abfd, header_ext.xref_count);
- header.xref_lst_offset = bfd_h_get_32 (abfd, header_ext.xref_lst_offset);
+ header.version = H_GET_32 (abfd, header_ext.version);
+ header.mod_count = H_GET_32 (abfd, header_ext.mod_count);
+ header.mod_tbl_offset = H_GET_32 (abfd, header_ext.mod_tbl_offset);
+ header.sym_tbl_size = H_GET_32 (abfd, header_ext.sym_tbl_size);
+ header.sym_count = H_GET_32 (abfd, header_ext.sym_count);
+ header.sym_tbl_offset = H_GET_32 (abfd, header_ext.sym_tbl_offset);
+ header.xref_count = H_GET_32 (abfd, header_ext.xref_count);
+ header.xref_lst_offset = H_GET_32 (abfd, header_ext.xref_lst_offset);
/*
There isn't a magic number in an Oasys archive, so the best we
header.mod_count > 10000 ||
header.sym_count > 100000 ||
header.xref_count > 100000)
- return (bfd_target *) NULL;
+ return (const bfd_target *) NULL;
/*
That all worked, let's buy the space for the header and read in
the headers.
*/
{
- oasys_ar_data_type *ar =
- (oasys_ar_data_type *) bfd_alloc (abfd, sizeof (oasys_ar_data_type));
-
- oasys_module_info_type *module =
- (oasys_module_info_type *)
- bfd_alloc (abfd, sizeof (oasys_module_info_type) * header.mod_count);
+ oasys_ar_data_type *ar;
+ oasys_module_info_type *module;
oasys_module_table_type record;
+ amt = sizeof (oasys_ar_data_type);
+ ar = (oasys_ar_data_type *) bfd_alloc (abfd, amt);
+
+ amt = header.mod_count;
+ amt *= sizeof (oasys_module_info_type);
+ module = (oasys_module_info_type *) bfd_alloc (abfd, amt);
+
if (!ar || !module)
- {
- bfd_set_error (bfd_error_no_memory);
- return NULL;
- }
+ return NULL;
abfd->tdata.oasys_ar_data = ar;
ar->module = module;
if (0)
{
oasys_extmodule_table_type_a_type record_ext;
- if (bfd_read ((PTR) & record_ext, 1, sizeof (record_ext), abfd)
- != sizeof (record_ext))
+
+ amt = sizeof (record_ext);
+ if (bfd_bread ((PTR) &record_ext, amt, abfd) != amt)
return NULL;
- record.mod_size = bfd_h_get_32 (abfd, record_ext.mod_size);
- record.file_offset = bfd_h_get_32 (abfd, record_ext.file_offset);
+ record.mod_size = H_GET_32 (abfd, record_ext.mod_size);
+ record.file_offset = H_GET_32 (abfd, record_ext.file_offset);
- record.dep_count = bfd_h_get_32 (abfd, record_ext.dep_count);
- record.depee_count = bfd_h_get_32 (abfd, record_ext.depee_count);
- record.sect_count = bfd_h_get_32 (abfd, record_ext.sect_count);
+ record.dep_count = H_GET_32 (abfd, record_ext.dep_count);
+ record.depee_count = H_GET_32 (abfd, record_ext.depee_count);
+ record.sect_count = H_GET_32 (abfd, record_ext.sect_count);
- module[i].name = bfd_alloc (abfd, 33);
+ module[i].name = bfd_alloc (abfd, (bfd_size_type) 33);
if (!module[i].name)
- {
- bfd_set_error (bfd_error_no_memory);
- return NULL;
- }
+ return NULL;
memcpy (module[i].name, record_ext.mod_name, 33);
filepos +=
else
{
oasys_extmodule_table_type_b_type record_ext;
- if (bfd_read ((PTR) & record_ext, 1, sizeof (record_ext), abfd)
- != sizeof (record_ext))
+
+ amt = sizeof (record_ext);
+ if (bfd_bread ((PTR) &record_ext, amt, abfd) != amt)
return NULL;
- record.mod_size = bfd_h_get_32 (abfd, record_ext.mod_size);
- record.file_offset = bfd_h_get_32 (abfd, record_ext.file_offset);
+ record.mod_size = H_GET_32 (abfd, record_ext.mod_size);
+ record.file_offset = H_GET_32 (abfd, record_ext.file_offset);
- record.dep_count = bfd_h_get_32 (abfd, record_ext.dep_count);
- record.depee_count = bfd_h_get_32 (abfd, record_ext.depee_count);
- record.sect_count = bfd_h_get_32 (abfd, record_ext.sect_count);
- record.module_name_size = bfd_h_get_32 (abfd, record_ext.mod_name_length);
+ record.dep_count = H_GET_32 (abfd, record_ext.dep_count);
+ record.depee_count = H_GET_32 (abfd, record_ext.depee_count);
+ record.sect_count = H_GET_32 (abfd, record_ext.sect_count);
+ record.module_name_size = H_GET_32 (abfd,
+ record_ext.mod_name_length);
- module[i].name = bfd_alloc (abfd, record.module_name_size + 1);
+ amt = record.module_name_size;
+ module[i].name = bfd_alloc (abfd, amt + 1);
if (!module[i].name)
- {
- bfd_set_error (bfd_error_no_memory);
- return NULL;
- }
- if (bfd_read ((PTR) module[i].name, 1, record.module_name_size,
- abfd)
- != record.module_name_size)
+ return NULL;
+ if (bfd_bread ((PTR) module[i].name, amt, abfd) != amt)
return NULL;
module[i].name[record.module_name_size] = 0;
- filepos +=
- sizeof (record_ext) +
- record.dep_count * 4 +
- record.module_name_size + 1;
-
+ filepos += (sizeof (record_ext)
+ + record.dep_count * 4
+ + record.module_name_size + 1);
}
-
module[i].size = record.mod_size;
module[i].pos = record.file_offset;
module[i].abfd = 0;
}
-
}
return abfd->xvec;
}
-static boolean
+static bfd_boolean
oasys_mkobject (abfd)
bfd *abfd;
{
-
- abfd->tdata.oasys_obj_data = (oasys_data_type *) bfd_alloc (abfd, sizeof (oasys_data_type));
- return abfd->tdata.oasys_obj_data ? true : false;
+ bfd_size_type amt = sizeof (oasys_data_type);
+ abfd->tdata.oasys_obj_data = (oasys_data_type *) bfd_alloc (abfd, amt);
+ return abfd->tdata.oasys_obj_data != NULL;
}
#define MAX_SECS 16
-static bfd_target *
+static const bfd_target *
oasys_object_p (abfd)
bfd *abfd;
{
oasys_data_type *oasys;
oasys_data_type *save = OASYS_DATA (abfd);
- boolean loop = true;
- boolean had_usefull = false;
+ bfd_boolean loop = TRUE;
+ bfd_boolean had_usefull = FALSE;
abfd->tdata.oasys_obj_data = 0;
oasys_mkobject (abfd);
switch ((oasys_record_enum_type) (record.header.type))
{
case oasys_record_is_header_enum:
- had_usefull = true;
+ had_usefull = TRUE;
break;
case oasys_record_is_symbol_enum:
case oasys_record_is_local_enum:
/* Count symbols and remember their size for a future malloc */
abfd->symcount++;
oasys->symbol_string_length += 1 + oasys_string_length (&record);
- had_usefull = true;
+ had_usefull = TRUE;
break;
case oasys_record_is_section_enum:
{
{
goto fail;
}
- buffer = bfd_alloc (abfd, 3);
+ buffer = bfd_alloc (abfd, (bfd_size_type) 3);
if (!buffer)
- {
- bfd_set_error (bfd_error_no_memory);
- goto fail;
- }
+ goto fail;
section_number = record.section.relb & RELOCATION_SECT_BITS;
sprintf (buffer, "%u", section_number);
s = bfd_make_section (abfd, buffer);
BFD_FAIL ();
}
- s->_raw_size = bfd_h_get_32 (abfd, record.section.value);
- s->vma = bfd_h_get_32 (abfd, record.section.vma);
+ s->_raw_size = H_GET_32 (abfd, record.section.value);
+ s->vma = H_GET_32 (abfd, record.section.vma);
s->flags = 0;
- had_usefull = true;
+ had_usefull = TRUE;
}
break;
case oasys_record_is_data_enum:
case oasys_record_is_module_enum:
case oasys_record_is_named_section_enum:
case oasys_record_is_end_enum:
- if (had_usefull == false)
+ if (! had_usefull)
goto fail;
- loop = false;
+ loop = FALSE;
break;
default:
goto fail;
fail:
(void) bfd_release (abfd, oasys);
abfd->tdata.oasys_obj_data = save;
- return (bfd_target *) NULL;
+ return (const bfd_target *) NULL;
}
static void
oasys_get_symbol_info (ignore_abfd, symbol, ret)
- bfd *ignore_abfd;
+ bfd *ignore_abfd ATTRIBUTE_UNUSED;
asymbol *symbol;
symbol_info *ret;
{
}
static void
-oasys_print_symbol (ignore_abfd, afile, symbol, how)
- bfd *ignore_abfd;
+oasys_print_symbol (abfd, afile, symbol, how)
+ bfd *abfd;
PTR afile;
asymbol *symbol;
bfd_print_symbol_type how;
break;
case bfd_print_symbol_all:
{
- CONST char *section_name = symbol->section == (asection *) NULL ?
- (CONST char *) "*abs" : symbol->section->name;
+ const char *section_name = symbol->section == (asection *) NULL ?
+ (const char *) "*abs" : symbol->section->name;
- bfd_print_symbol_vandf ((PTR) file, symbol);
+ bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
fprintf (file, " %-5s %s",
section_name,
static reloc_howto_type howto_table[] =
{
- HOWTO (0, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false),
- HOWTO (0, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "abs32", true, 0xffffffff, 0xffffffff, false),
- HOWTO (0, 0, 1, 16, true, 0, complain_overflow_signed, 0, "pcrel16", true, 0x0000ffff, 0x0000ffff, false),
- HOWTO (0, 0, 2, 32, true, 0, complain_overflow_signed, 0, "pcrel32", true, 0xffffffff, 0xffffffff, false)
+ HOWTO (0, 0, 1, 16, FALSE, 0, complain_overflow_bitfield, 0, "abs16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+ HOWTO (0, 0, 2, 32, FALSE, 0, complain_overflow_bitfield, 0, "abs32", TRUE, 0xffffffff, 0xffffffff, FALSE),
+ HOWTO (0, 0, 1, 16, TRUE, 0, complain_overflow_signed, 0, "pcrel16", TRUE, 0x0000ffff, 0x0000ffff, FALSE),
+ HOWTO (0, 0, 2, 32, TRUE, 0, complain_overflow_signed, 0, "pcrel32", TRUE, 0xffffffff, 0xffffffff, FALSE)
};
/* Read in all the section data and relocation stuff too */
-static boolean
+static bfd_boolean
oasys_slurp_section_data (abfd)
- bfd *CONST abfd;
+ bfd *const abfd;
{
oasys_record_union_type record;
oasys_data_type *data = OASYS_DATA (abfd);
- boolean loop = true;
-
+ bfd_boolean loop = TRUE;
oasys_per_section_type *per;
-
asection *s;
+ bfd_size_type amt;
/* See if the data has been slurped already .. */
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
per = oasys_per_section (s);
- if (per->initialized == true)
- return true;
+ if (per->initialized)
+ return TRUE;
}
if (data->first_data_record == 0)
- return true;
+ return TRUE;
if (bfd_seek (abfd, data->first_data_record, SEEK_SET) != 0)
- return false;
+ return FALSE;
while (loop)
{
if (! oasys_read_record (abfd, &record))
- return false;
+ return FALSE;
switch (record.header.type)
{
case oasys_record_is_header_enum:
per = oasys_per_section (section);
- if (per->initialized == false)
+ if (! per->initialized)
{
per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size);
if (!per->data)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
- per->reloc_tail_ptr = (oasys_reloc_type **) & (section->relocation);
- per->had_vma = false;
- per->initialized = true;
+ return FALSE;
+ per->reloc_tail_ptr
+ = (oasys_reloc_type **) §ion->relocation;
+ per->had_vma = FALSE;
+ per->initialized = TRUE;
section->reloc_count = 0;
section->flags = SEC_ALLOC;
}
- dst_offset = bfd_h_get_32 (abfd, record.data.addr);
- if (per->had_vma == false)
+ dst_offset = H_GET_32 (abfd, record.data.addr);
+ if (! per->had_vma)
{
/* Take the first vma we see as the base */
section->vma = dst_offset;
- per->had_vma = true;
+ per->had_vma = TRUE;
}
dst_offset -= section->vma;
case RELOCATION_TYPE_REL:
{
/* Relocate the item relative to the section */
- oasys_reloc_type *r =
- (oasys_reloc_type *)
- bfd_alloc (abfd,
- sizeof (oasys_reloc_type));
+ oasys_reloc_type *r;
+
+ amt = sizeof (oasys_reloc_type);
+ r = (oasys_reloc_type *) bfd_alloc (abfd,
+ amt);
if (!r)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
+ return FALSE;
*(per->reloc_tail_ptr) = r;
per->reloc_tail_ptr = &r->next;
r->next = (oasys_reloc_type *) NULL;
r->relent.sym_ptr_ptr = (asymbol **) NULL;
section->reloc_count++;
- /* Fake up the data to look like it's got the -ve pc in it, this makes
- it much easier to convert into other formats. This is done by
- hitting the addend.
- */
- if (r->relent.howto->pc_relative == true)
- {
- r->relent.addend -= dst_ptr - dst_base_ptr;
- }
-
-
+ /* Fake up the data to look like
+ it's got the -ve pc in it, this
+ makes it much easier to convert
+ into other formats. This is done
+ by hitting the addend. */
+ if (r->relent.howto->pc_relative)
+ r->relent.addend -= dst_ptr - dst_base_ptr;
}
break;
case RELOCATION_TYPE_UND:
{
- oasys_reloc_type *r =
- (oasys_reloc_type *)
- bfd_alloc (abfd,
- sizeof (oasys_reloc_type));
+ oasys_reloc_type *r;
+
+ amt = sizeof (oasys_reloc_type);
+ r = (oasys_reloc_type *) bfd_alloc (abfd,
+ amt);
if (!r)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
+ return FALSE;
*(per->reloc_tail_ptr) = r;
per->reloc_tail_ptr = &r->next;
r->next = (oasys_reloc_type *) NULL;
section->reloc_count++;
src += 2;
- /* Fake up the data to look like it's got the -ve pc in it, this makes
- it much easier to convert into other formats. This is done by
- hitting the addend.
- */
- if (r->relent.howto->pc_relative == true)
- {
- r->relent.addend -= dst_ptr - dst_base_ptr;
- }
-
-
-
+ /* Fake up the data to look like
+ it's got the -ve pc in it, this
+ makes it much easier to convert
+ into other formats. This is done
+ by hitting the addend. */
+ if (r->relent.howto->pc_relative)
+ r->relent.addend -= dst_ptr - dst_base_ptr;
}
break;
case RELOCATION_TYPE_COM:
case oasys_record_is_section_enum:
break;
default:
- loop = false;
+ loop = FALSE;
}
}
- return true;
+ return TRUE;
}
-static boolean
+static bfd_boolean
oasys_new_section_hook (abfd, newsect)
bfd *abfd;
asection *newsect;
{
newsect->used_by_bfd = (PTR)
- bfd_alloc (abfd, sizeof (oasys_per_section_type));
+ bfd_alloc (abfd, (bfd_size_type) sizeof (oasys_per_section_type));
if (!newsect->used_by_bfd)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
+ return FALSE;
oasys_per_section (newsect)->data = (bfd_byte *) NULL;
oasys_per_section (newsect)->section = newsect;
oasys_per_section (newsect)->offset = 0;
- oasys_per_section (newsect)->initialized = false;
+ oasys_per_section (newsect)->initialized = FALSE;
newsect->alignment_power = 1;
/* Turn the section string into an index */
sscanf (newsect->name, "%u", &newsect->target_index);
- return true;
+ return TRUE;
}
return (asect->reloc_count + 1) * sizeof (arelent *);
}
-static boolean
+static bfd_boolean
oasys_get_section_contents (abfd, section, location, offset, count)
bfd *abfd;
sec_ptr section;
{
oasys_per_section_type *p = (oasys_per_section_type *) section->used_by_bfd;
oasys_slurp_section_data (abfd);
- if (p->initialized == false)
+ if (! p->initialized)
{
- (void) memset (location, 0, (int) count);
+ (void) memset (location, 0, (size_t) count);
}
else
{
- (void) memcpy (location, (PTR) (p->data + offset), (int) count);
+ (void) memcpy (location, (PTR) (p->data + offset), (size_t) count);
}
- return true;
+ return TRUE;
}
long
oasys_canonicalize_reloc (ignore_abfd, section, relptr, symbols)
- bfd *ignore_abfd;
+ bfd *ignore_abfd ATTRIBUTE_UNUSED;
sec_ptr section;
arelent **relptr;
- asymbol **symbols;
+ asymbol **symbols ATTRIBUTE_UNUSED;
{
unsigned int reloc_count = 0;
oasys_reloc_type *src = (oasys_reloc_type *) (section->relocation);
/* Calculate the checksum and write one record */
-static boolean
+static bfd_boolean
oasys_write_record (abfd, type, record, size)
bfd *abfd;
oasys_record_enum_type type;
checksum += *ptr++;
}
record->header.check_sum = 0xff & (-checksum);
- if (bfd_write ((PTR) record, 1, size, abfd) != size)
- return false;
- return true;
+ if (bfd_bwrite ((PTR) record, (bfd_size_type) size, abfd) != size)
+ return FALSE;
+ return TRUE;
}
/* Write out all the symbols */
-static boolean
+static bfd_boolean
oasys_write_syms (abfd)
bfd *abfd;
{
{
oasys_symbol_record_type symbol;
- asymbol *CONST g = generic[count];
+ asymbol *const g = generic[count];
- CONST char *src = g->name;
+ const char *src = g->name;
char *dst = symbol.name;
unsigned int l = 0;
if (bfd_is_com_section (g->section))
{
symbol.relb = RELOCATION_TYPE_COM;
- bfd_h_put_16 (abfd, index, symbol.refno);
+ H_PUT_16 (abfd, index, symbol.refno);
index++;
}
- else if (g->section == &bfd_abs_section)
+ else if (bfd_is_abs_section (g->section))
{
symbol.relb = RELOCATION_TYPE_ABS;
- bfd_h_put_16 (abfd, 0, symbol.refno);
+ H_PUT_16 (abfd, 0, symbol.refno);
}
- else if (g->section == &bfd_und_section)
+ else if (bfd_is_und_section (g->section))
{
symbol.relb = RELOCATION_TYPE_UND;
- bfd_h_put_16 (abfd, index, symbol.refno);
+ H_PUT_16 (abfd, index, symbol.refno);
/* Overload the value field with the output index number */
index++;
}
{
symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index;
}
- bfd_h_put_16 (abfd, 0, symbol.refno);
+ H_PUT_16 (abfd, 0, symbol.refno);
}
#ifdef UNDERSCORE_HACK
if (src[l] == '_')
l++;
}
- bfd_h_put_32 (abfd, g->value, symbol.value);
+ H_PUT_32 (abfd, g->value, symbol.value);
if (g->flags & BSF_LOCAL)
(oasys_record_union_type *) & symbol,
offsetof (oasys_symbol_record_type,
name[0]) + l))
- return false;
+ return FALSE;
}
else
{
(oasys_record_union_type *) & symbol,
offsetof (oasys_symbol_record_type,
name[0]) + l))
- return false;
+ return FALSE;
}
g->value = index - 1;
}
- return true;
+ return TRUE;
}
/* Write a section header for each section */
-static boolean
+static bfd_boolean
oasys_write_sections (abfd)
bfd *abfd;
{
for (s = abfd->sections; s != (asection *) NULL; s = s->next)
{
- if (!isdigit (s->name[0]))
+ if (!ISDIGIT (s->name[0]))
{
+ (*_bfd_error_handler)
+ (_("%s: can not represent section `%s' in oasys"),
+ bfd_get_filename (abfd), s->name);
bfd_set_error (bfd_error_nonrepresentable_section);
- return false;
+ return FALSE;
}
out.relb = RELOCATION_TYPE_REL | s->target_index;
- bfd_h_put_32 (abfd, s->_cooked_size, out.value);
- bfd_h_put_32 (abfd, s->vma, out.vma);
+ H_PUT_32 (abfd, s->_cooked_size, out.value);
+ H_PUT_32 (abfd, s->vma, out.vma);
if (! oasys_write_record (abfd,
oasys_record_is_section_enum,
(oasys_record_union_type *) & out,
sizeof (out)))
- return false;
+ return FALSE;
}
- return true;
+ return TRUE;
}
-static boolean
+static bfd_boolean
oasys_write_header (abfd)
bfd *abfd;
{
(oasys_record_union_type *) & r,
offsetof (oasys_header_record_type,
description[0])))
- return false;
+ return FALSE;
- return true;
+ return TRUE;
}
-static boolean
+static bfd_boolean
oasys_write_end (abfd)
bfd *abfd;
{
oasys_end_record_type end;
unsigned char null = 0;
end.relb = RELOCATION_TYPE_ABS;
- bfd_h_put_32 (abfd, abfd->start_address, end.entry);
- bfd_h_put_16 (abfd, 0, end.fill);
+ H_PUT_32 (abfd, abfd->start_address, end.entry);
+ H_PUT_16 (abfd, 0, end.fill);
end.zero = 0;
if (! oasys_write_record (abfd,
oasys_record_is_end_enum,
(oasys_record_union_type *) & end,
sizeof (end)))
- return false;
- if (bfd_write ((PTR) & null, 1, 1, abfd) != 1)
- return false;
- return true;
+ return FALSE;
+ if (bfd_bwrite ((PTR) &null, (bfd_size_type) 1, abfd) != 1)
+ return FALSE;
+ return TRUE;
}
static int
comp (ap, bp)
- CONST PTR ap;
- CONST PTR bp;
+ const PTR ap;
+ const PTR bp;
{
arelent *a = *((arelent **) ap);
arelent *b = *((arelent **) bp);
Writing data..
*/
-static boolean
+static bfd_boolean
oasys_write_data (abfd)
bfd *abfd;
{
*mod = 0;
- bfd_h_put_32 (abfd, s->vma + current_byte_index,
- processed_data.addr);
+ H_PUT_32 (abfd, s->vma + current_byte_index,
+ processed_data.addr);
/* Don't start a relocation unless you're sure you can finish it
within the same data record. The worst case relocation is a
if (relocs_to_go != 0)
{
arelent *r = *p;
- const reloc_howto_type *const how = r->howto;
+ reloc_howto_type *const how = r->howto;
/* There is a relocation, is it for this byte ? */
if (r->address == current_byte_index)
{
else
#endif
{
- asymbol *p = *(r->sym_ptr_ptr);
+ asymbol *sym = *(r->sym_ptr_ptr);
/* If this symbol has a section attached, then it
has already been resolved. Change from a symbol
ref to a section ref */
- if (p->section != (asection *) NULL)
+ if (sym->section != (asection *) NULL)
{
rel_byte |= RELOCATION_TYPE_REL;
rel_byte |=
- p->section->output_section->target_index;
+ sym->section->output_section->target_index;
*dst++ = rel_byte;
}
else
into the symbol index in the table when the
symbol table was written
*/
- *dst++ = p->value >> 8;
- *dst++ = p->value;
+ *dst++ = sym->value >> 8;
+ *dst++ = sym->value;
}
}
#define ADVANCE { if (++i >= 8) { i = 0; mod = dst++; *mod = 0; } current_byte_index++; }
--dst;
}
- if (! oasys_write_record (abfd,
- oasys_record_is_data_enum,
- ((oasys_record_union_type *)
- & processed_data),
- dst - (bfd_byte *) & processed_data))
- return false;
+ if (! (oasys_write_record
+ (abfd, oasys_record_is_data_enum,
+ ((oasys_record_union_type *) &processed_data),
+ (size_t) (dst - (bfd_byte *) &processed_data))))
+ return FALSE;
}
}
}
- return true;
+ return TRUE;
}
-static boolean
+static bfd_boolean
oasys_write_object_contents (abfd)
bfd *abfd;
{
if (! oasys_write_header (abfd))
- return false;
+ return FALSE;
if (! oasys_write_syms (abfd))
- return false;
+ return FALSE;
if (! oasys_write_sections (abfd))
- return false;
+ return FALSE;
if (! oasys_write_data (abfd))
- return false;
+ return FALSE;
if (! oasys_write_end (abfd))
- return false;
- return true;
+ return FALSE;
+ return TRUE;
}
/* set section contents is complicated with OASYS since the format is
* not a byte image, but a record stream.
*/
-static boolean
+static bfd_boolean
oasys_set_section_contents (abfd, section, location, offset, count)
bfd *abfd;
sec_ptr section;
oasys_per_section (section)->data =
(bfd_byte *) (bfd_alloc (abfd, section->_cooked_size));
if (!oasys_per_section (section)->data)
- {
- bfd_set_error (bfd_error_no_memory);
- return false;
- }
+ return FALSE;
}
(void) memcpy ((PTR) (oasys_per_section (section)->data + offset),
location,
- count);
+ (size_t) count);
}
- return true;
+ return TRUE;
}
oasys_make_empty_symbol (abfd)
bfd *abfd;
{
-
- oasys_symbol_type *new =
- (oasys_symbol_type *) bfd_zalloc (abfd, sizeof (oasys_symbol_type));
+ bfd_size_type amt = sizeof (oasys_symbol_type);
+ oasys_symbol_type *new = (oasys_symbol_type *) bfd_zalloc (abfd, amt);
if (!new)
- {
- bfd_set_error (bfd_error_no_memory);
- return NULL;
- }
+ return NULL;
new->symbol.the_bfd = abfd;
return &new->symbol;
}
}
}
-static boolean
-oasys_find_nearest_line (abfd,
- section,
- symbols,
- offset,
- filename_ptr,
- functionname_ptr,
- line_ptr)
- bfd *abfd;
- asection *section;
- asymbol **symbols;
- bfd_vma offset;
- char **filename_ptr;
- char **functionname_ptr;
- unsigned int *line_ptr;
+static bfd_boolean
+oasys_find_nearest_line (abfd, section, symbols, offset,
+ filename_ptr, functionname_ptr, line_ptr)
+ bfd *abfd ATTRIBUTE_UNUSED;
+ asection *section ATTRIBUTE_UNUSED;
+ asymbol **symbols ATTRIBUTE_UNUSED;
+ bfd_vma offset ATTRIBUTE_UNUSED;
+ const char **filename_ptr ATTRIBUTE_UNUSED;
+ const char **functionname_ptr ATTRIBUTE_UNUSED;
+ unsigned int *line_ptr ATTRIBUTE_UNUSED;
{
- return false;
+ return FALSE;
}
static int
oasys_sizeof_headers (abfd, exec)
- bfd *abfd;
- boolean exec;
+ bfd *abfd ATTRIBUTE_UNUSED;
+ bfd_boolean exec ATTRIBUTE_UNUSED;
{
return 0;
}
-#define FOO PROTO
-#define oasys_core_file_failing_command (char *(*)())(bfd_nullvoidptr)
-#define oasys_core_file_failing_signal (int (*)())bfd_0
-#define oasys_core_file_matches_executable_p 0
+
+#define oasys_close_and_cleanup _bfd_generic_close_and_cleanup
+#define oasys_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+
#define oasys_slurp_armap bfd_true
#define oasys_slurp_extended_name_table bfd_true
-#define oasys_truncate_arname (void (*)())bfd_nullvoidptr
-#define oasys_write_armap 0
-#define oasys_get_lineno (struct lineno_cache_entry *(*)())bfd_nullvoidptr
-#define oasys_close_and_cleanup bfd_generic_close_and_cleanup
+#define oasys_construct_extended_name_table \
+ ((bfd_boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
+ bfd_true)
+#define oasys_truncate_arname bfd_dont_truncate_arname
+#define oasys_write_armap \
+ ((bfd_boolean (*) \
+ PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
+ bfd_true)
+#define oasys_read_ar_hdr bfd_nullvoidptr
+#define oasys_get_elt_at_index _bfd_generic_get_elt_at_index
+#define oasys_update_armap_timestamp bfd_true
+
+#define oasys_bfd_is_local_label_name bfd_generic_is_local_label_name
+#define oasys_get_lineno _bfd_nosymbols_get_lineno
+#define oasys_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
+#define oasys_read_minisymbols _bfd_generic_read_minisymbols
+#define oasys_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+
+#define oasys_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+
#define oasys_set_arch_mach bfd_default_set_arch_mach
-#define oasys_bfd_debug_info_start bfd_void
-#define oasys_bfd_debug_info_end bfd_void
-#define oasys_bfd_debug_info_accumulate (FOO(void, (*), (bfd *, asection *)))bfd_void
-#define oasys_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
+
+#define oasys_get_section_contents_in_window \
+ _bfd_generic_get_section_contents_in_window
+
+#define oasys_bfd_get_relocated_section_contents \
+ bfd_generic_get_relocated_section_contents
#define oasys_bfd_relax_section bfd_generic_relax_section
-#define oasys_bfd_reloc_type_lookup \
- ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
-#define oasys_bfd_make_debug_symbol \
- ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
+#define oasys_bfd_gc_sections bfd_generic_gc_sections
+#define oasys_bfd_merge_sections bfd_generic_merge_sections
+#define oasys_bfd_discard_group bfd_generic_discard_group
#define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#define oasys_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
#define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#define oasys_bfd_link_just_syms _bfd_generic_link_just_syms
#define oasys_bfd_final_link _bfd_generic_final_link
-#define oasys_bfd_copy_private_section_data \
- ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
-#define oasys_bfd_copy_private_bfd_data \
- ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define oasys_bfd_is_local_label bfd_generic_is_local_label
-#define oasys_bfd_free_cached_info bfd_true
+#define oasys_bfd_link_split_section _bfd_generic_link_split_section
/*SUPPRESS 460 */
-bfd_target oasys_vec =
+const bfd_target oasys_vec =
{
"oasys", /* name */
bfd_target_oasys_flavour,
- true, /* target byte order */
- true, /* target headers byte order */
+ BFD_ENDIAN_BIG, /* target byte order */
+ BFD_ENDIAN_BIG, /* target headers byte order */
(HAS_RELOC | EXEC_P | /* object flags */
HAS_LINENO | HAS_DEBUG |
HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
0, /* leading underscore */
' ', /* ar_pad_char */
16, /* ar_max_namelen */
- 1, /* minimum alignment */
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_write_archive_contents,
bfd_false,
},
- JUMP_TABLE (oasys),
+
+ BFD_JUMP_TABLE_GENERIC (oasys),
+ BFD_JUMP_TABLE_COPY (_bfd_generic),
+ BFD_JUMP_TABLE_CORE (_bfd_nocore),
+ BFD_JUMP_TABLE_ARCHIVE (oasys),
+ BFD_JUMP_TABLE_SYMBOLS (oasys),
+ BFD_JUMP_TABLE_RELOCS (oasys),
+ BFD_JUMP_TABLE_WRITE (oasys),
+ BFD_JUMP_TABLE_LINK (oasys),
+ BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
+
+ NULL,
+
(PTR) 0
};
projects / binutils.git / blobdiff