/* bfd backend for oasys objects.
+ Copyright (C) 1990-1991 Free Software Foundation, Inc.
-/* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+This file is part of BFD, the Binary File Descriptor library.
-This file is part of BFD, the Binary File Diddler.
-
-BFD is free software; you can redistribute it and/or modify
+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 1, or (at your option)
-any later version.
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
-BFD is distributed in the hope that it will be useful,
+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 BFD; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* $Id$ */
#define UNDERSCORE_HACK 1
-#define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier)
-
#include <ansidecl.h>
-#include "sysdep.h"
+#include <sysdep.h>
+
#include "bfd.h"
#include "libbfd.h"
-#include "obstack.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
+
+/* Read in all the section data and relocation stuff too */
+PROTO(static boolean,oasys_slurp_section_data,(bfd *CONST abfd));
+
static void
DEFUN(oasys_read_record,(abfd, record),
bfd *CONST abfd AND
oasys_record_union_type *record)
{
- bfd_read(record, 1, sizeof(record->header), abfd);
+ bfd_read((PTR)record, 1, sizeof(record->header), abfd);
if ((size_t) record->header.length <= (size_t) sizeof (record->header))
return;
- bfd_read(((char *)record )+ sizeof(record->header),
+ bfd_read((PTR)(((char *)record )+ sizeof(record->header)),
1, record->header.length - sizeof(record->header),
abfd);
}
oasys_record_union_type record;
oasys_data_type *data = oasys_data(abfd);
boolean loop = true;
- asymbol *dest_undefined;
asymbol *dest_defined;
asymbol *dest;
char *string_ptr;
#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);
+ abfd->symcount);
#else
data->strings = bfd_alloc(abfd, data->symbol_string_length);
#endif
- dest_undefined = data->symbols;
+
dest_defined = data->symbols + abfd->symcount -1;
string_ptr = data->strings;
if (record.header.type == oasys_record_is_local_enum)
{
dest->flags = BSF_LOCAL;
+ if (dest->section ==(asection *)(~0)) {
+ /* It seems that sometimes internal symbols are tied up, but
+ still get output, even though there is no
+ section */
+ dest->section = 0;
+ }
}
else {
}
break;
case RELOCATION_TYPE_UND:
- dest = data->symbols + bfd_h_getshort(abfd, &record.symbol.refno[0]);
+ dest = data->symbols + bfd_h_get_16(abfd, (bfd_byte *)&record.symbol.refno[0]);
dest->section = (asection *)NULL;
dest->flags = BSF_UNDEFINED;
break;
dest->section = (asection *)NULL;
dest->flags = BSF_FORT_COMM;
break;
+ default:
+ dest = dest_defined--;
+ BFD_ASSERT(0);
+ break;
}
dest->name = string_ptr;
dest->the_bfd = abfd;
dest->udata = (PTR)NULL;
- dest->value = bfd_h_getlong(abfd, &record.symbol.value[0]);
+ dest->value = bfd_h_get_32(abfd, (bfd_byte *)&record.symbol.value[0]);
#ifdef UNDERSCORE_HACK
if (record.symbol.name[0] != '_') {
}
}
return true;
-
}
-static size_t
+static unsigned int
DEFUN(oasys_get_symtab_upper_bound,(abfd),
bfd *CONST abfd)
{
/***********************************************************************
* archive stuff
*/
-#define swap(x) x = bfd_h_get_x(abfd, &x);
+
static bfd_target *
DEFUN(oasys_archive_p,(abfd),
bfd *abfd)
{
oasys_archive_header_type header;
+ oasys_extarchive_header_type header_ext;
unsigned int i;
-
+ file_ptr filepos;
bfd_seek(abfd, (file_ptr) 0, false);
- bfd_read(&header, 1, sizeof(header), abfd);
+ bfd_read((PTR)&header_ext, 1, sizeof(header_ext), abfd);
-
- swap(header.version);
- swap(header.mod_count);
- swap(header.mod_tbl_offset);
- swap(header.sym_tbl_size);
- swap(header.sym_count);
- swap(header.sym_tbl_offset);
- swap(header.xref_count);
- swap(header.xref_lst_offset);
+
+ header.version = bfd_h_get_32(abfd, (bfd_byte *)header_ext.version);
+ header.mod_count = bfd_h_get_32(abfd, (bfd_byte *)header_ext.mod_count);
+ header.mod_tbl_offset = bfd_h_get_32(abfd, (bfd_byte *)header_ext.mod_tbl_offset);
+ header.sym_tbl_size = bfd_h_get_32(abfd, (bfd_byte *)header_ext.sym_tbl_size);
+ header.sym_count = bfd_h_get_32(abfd, (bfd_byte *)header_ext.sym_count);
+ header.sym_tbl_offset = bfd_h_get_32(abfd, (bfd_byte *)header_ext.sym_tbl_offset);
+ header.xref_count = bfd_h_get_32(abfd, (bfd_byte *)header_ext.xref_count);
+ header.xref_lst_offset = bfd_h_get_32(abfd, (bfd_byte *)header_ext.xref_lst_offset);
/*
- There isn't a magic number in an Oasys archive, so the best we
- can do to verify reasnableness is to make sure that the values in
- the header are too weird
- */
+ There isn't a magic number in an Oasys archive, so the best we
+ can do to verify reasnableness is to make sure that the values in
+ the header are too weird
+ */
if (header.version>10000 ||
header.mod_count>10000 ||
header.xref_count > 100000) return (bfd_target *)NULL;
/*
- That all worked, lets 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));
+ That all worked, lets 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_module_info_type *module =
+ (oasys_module_info_type*)
+ bfd_alloc(abfd, sizeof(oasys_module_info_type) * header.mod_count);
- oasys_module_table_type record;
- set_tdata(abfd, ar);
- ar->module = module;
- ar->module_count = header.mod_count;
+ oasys_module_table_type record;
- bfd_seek(abfd , header.mod_tbl_offset, SEEK_SET);
- for (i = 0; i < header.mod_count; i++) {
- bfd_read(&record, 1, sizeof(record), abfd);
- swap(record.mod_size);
- swap(record.file_offset);
- swap(record.mod_name_length);
- module[i].name = bfd_alloc(abfd,record.mod_name_length+1);
+ set_tdata(abfd, ar);
+ ar->module = module;
+ ar->module_count = header.mod_count;
- bfd_read(module[i].name, 1, record.mod_name_length +1, abfd);
- /* SKip some stuff */
- bfd_seek(abfd, record.dep_count * sizeof(int32_type),
- SEEK_CUR);
- module[i].size = record.mod_size;
- module[i].pos = record.file_offset;
- }
+ filepos = header.mod_tbl_offset;
+ for (i = 0; i < header.mod_count; i++) {
+ bfd_seek(abfd , filepos, SEEK_SET);
+
+ /* There are two ways of specifying the archive header */
+
+ if (0) {
+ oasys_extmodule_table_type_a_type record_ext;
+ bfd_read((PTR)&record_ext, 1, sizeof(record_ext), abfd);
+
+ record.mod_size = bfd_h_get_32(abfd, (bfd_byte *)record_ext.mod_size);
+ record.file_offset = bfd_h_get_32(abfd,
+ (bfd_byte *) record_ext.file_offset);
+
+ record.dep_count = bfd_h_get_32(abfd, (bfd_byte *)record_ext.dep_count);
+ record.depee_count = bfd_h_get_32(abfd,(bfd_byte *) record_ext.depee_count);
+ record.sect_count = bfd_h_get_32(abfd, (bfd_byte *) record_ext.sect_count);
+
+
+ module[i].name = bfd_alloc(abfd,33);
+
+ memcpy(module[i].name, record_ext.mod_name, 33);
+ filepos +=
+ sizeof(record_ext) +
+ record.dep_count * 4 +
+ record.depee_count * 4 +
+ record.sect_count * 8 + 187;
+ }
+ else {
+ oasys_extmodule_table_type_b_type record_ext;
+ bfd_read((PTR)&record_ext, 1, sizeof(record_ext), abfd);
+
+ record.mod_size = bfd_h_get_32(abfd, (bfd_byte *) record_ext.mod_size);
+ record.file_offset = bfd_h_get_32(abfd,
+ (bfd_byte *)record_ext.file_offset);
+
+ record.dep_count = bfd_h_get_32(abfd, (bfd_byte *) record_ext.dep_count);
+ record.depee_count = bfd_h_get_32(abfd, (bfd_byte *) record_ext.depee_count);
+ record.sect_count = bfd_h_get_32(abfd, (bfd_byte *) record_ext.sect_count);
+ record.module_name_size = bfd_h_get_32(abfd, (bfd_byte *) record_ext.mod_name_length);
+
+ module[i].name = bfd_alloc(abfd,record.module_name_size + 1);
+ bfd_read((PTR)module[i].name, 1, record.module_name_size, abfd);
+ module[i].name[record.module_name_size] = 0;
+ 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;
}
DEFUN(oasys_mkobject,(abfd),
bfd *abfd)
{
- oasys_data_type *oasys;
set_tdata (abfd,
(oasys_data_type*)bfd_alloc(abfd, sizeof(oasys_data_type)));
- oasys = oasys_data(abfd);
return true;
}
bfd *abfd)
{
oasys_data_type *oasys;
+ oasys_data_type *save = oasys_data(abfd);
boolean loop = true;
boolean had_usefull = false;
BFD_FAIL();
}
- s->size = bfd_h_getlong(abfd, & record.section.value[0]) ;
- s->vma = bfd_h_getlong(abfd, &record.section.vma[0]);
- s->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
+ s->size = bfd_h_get_32(abfd, (bfd_byte *) & record.section.value[0]) ;
+ s->vma = bfd_h_get_32(abfd, (bfd_byte *)&record.section.vma[0]);
+ s->flags= 0;
had_usefull = true;
}
break;
if (abfd->symcount != 0) {
abfd->flags |= HAS_SYMS;
}
+
+ /*
+ We don't know if a section has data until we've read it..
+ */
+
+ oasys_slurp_section_data(abfd);
+
+
return abfd->xvec;
fail:
(void) bfd_release(abfd, oasys);
+ set_tdata (abfd, save);
return (bfd_target *)NULL;
}
static void
-DEFUN(oasys_print_symbol,(ignore_abfd, file, symbol, how),
+DEFUN(oasys_print_symbol,(ignore_abfd, afile, symbol, how),
bfd *ignore_abfd AND
- FILE *file AND
+ PTR afile AND
asymbol *symbol AND
bfd_print_symbol_enum_type how)
{
+ FILE *file = (FILE *)afile;
+
switch (how) {
case bfd_print_symbol_name_enum:
case bfd_print_symbol_type_enum:
asection *s;
- /* Buy enough memory for all the section data and relocations */
+ /* 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->data != (bfd_byte*)NULL) return true;
- per->data = (bfd_byte *) bfd_alloc(abfd, s->size);
- per->reloc_tail_ptr = (oasys_reloc_type **)&(s->relocation);
- per->had_vma = false;
- s->reloc_count = 0;
+ if (per->initialized == true)
+ return true;
}
if (data->first_data_record == 0) return true;
+
bfd_seek(abfd, data->first_data_record, SEEK_SET);
while (loop) {
oasys_read_record(abfd, &record);
- switch (record.header.type) {
- case oasys_record_is_header_enum:
- break;
- case oasys_record_is_data_enum:
+ switch (record.header.type)
{
+ case oasys_record_is_header_enum:
+ break;
+ case oasys_record_is_data_enum:
+ {
+
+ uint8e_type *src = record.data.data;
+ uint8e_type *end_src = ((uint8e_type *)&record) +
+ record.header.length;
+ unsigned int relbit;
+ bfd_byte *dst_ptr ;
+ bfd_byte *dst_base_ptr ;
+ unsigned int count;
+ asection * section =
+ data->sections[record.data.relb & RELOCATION_SECT_BITS];
+ bfd_vma dst_offset ;
+ per = oasys_per_section(section);
+
+
+ if (per->initialized == false)
+ {
+ per->data = (bfd_byte *) bfd_zalloc(abfd, section->size);
+ per->reloc_tail_ptr = (oasys_reloc_type **)&(section->relocation);
+ per->had_vma = false;
+ per->initialized = true;
+ section->reloc_count = 0;
+ section->flags = SEC_ALLOC;
+ }
- uint8e_type *src = record.data.data;
- uint8e_type *end_src = ((uint8e_type *)&record) +
- record.header.length;
- unsigned int relbit;
- bfd_byte *dst_ptr ;
- bfd_byte *dst_base_ptr ;
- unsigned int count;
- asection * section =
- data->sections[record.data.relb & RELOCATION_SECT_BITS];
- bfd_vma dst_offset ;
- per = oasys_per_section(section);
- dst_offset = bfd_h_getlong(abfd, record.data.addr) ;
- if (per->had_vma == false) {
- /* Take the first vma we see as the base */
-
- section->vma = dst_offset;
- per->had_vma = true;
- }
+ dst_offset = bfd_h_get_32(abfd, record.data.addr) ;
+ if (per->had_vma == false) {
+ /* Take the first vma we see as the base */
+ section->vma = dst_offset;
+ per->had_vma = true;
+ }
- dst_offset -= section->vma;
-
-
- dst_base_ptr = oasys_per_section(section)->data;
- dst_ptr = oasys_per_section(section)->data +
- dst_offset;
-
- while (src < end_src) {
- uint32_type gap = end_src - src -1;
- uint8e_type mod_byte = *src++;
- count = 8;
- if (mod_byte == 0 && gap >= 8) {
- dst_ptr[0] = src[0];
- dst_ptr[1] = src[1];
- dst_ptr[2] = src[2];
- dst_ptr[3] = src[3];
- dst_ptr[4] = src[4];
- dst_ptr[5] = src[5];
- dst_ptr[6] = src[6];
- dst_ptr[7] = src[7];
- dst_ptr+= 8;
- src += 8;
- }
- else {
- for (relbit = 1; count-- != 0 && gap != 0; gap --, relbit <<=1)
- {
- if (relbit & mod_byte)
- {
- uint8e_type reloc = *src;
- /* This item needs to be relocated */
- switch (reloc & RELOCATION_TYPE_BITS) {
- case RELOCATION_TYPE_ABS:
-
- break;
-
- 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));
- *(per->reloc_tail_ptr) = r;
- per->reloc_tail_ptr = &r->next;
- r->next= (oasys_reloc_type *)NULL;
- /* Reference to undefined symbol */
- src++;
- /* There is no symbol */
- r->symbol = 0;
- /* Work out the howto */
- r->relent.section =
- data->sections[reloc & RELOCATION_SECT_BITS];
- r->relent.addend = - r->relent.section->vma;
- r->relent.address = dst_ptr - dst_base_ptr;
- r->relent.howto = &howto_table[reloc>>6];
- 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;
- }
+ dst_offset -= section->vma;
- }
- break;
-
-
- case RELOCATION_TYPE_UND:
- {
- oasys_reloc_type *r =
- (oasys_reloc_type *)
- bfd_alloc(abfd,
- sizeof(oasys_reloc_type));
- *(per->reloc_tail_ptr) = r;
- per->reloc_tail_ptr = &r->next;
- r->next= (oasys_reloc_type *)NULL;
- /* Reference to undefined symbol */
- src++;
- /* Get symbol number */
- r->symbol = (src[0]<<8) | src[1];
- /* Work out the howto */
- r->relent.section = (asection *)NULL;
- r->relent.addend = 0;
- r->relent.address = dst_ptr - dst_base_ptr;
- r->relent.howto = &howto_table[reloc>>6];
- r->relent.sym_ptr_ptr = (asymbol **)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;
- }
+
+ dst_base_ptr = oasys_per_section(section)->data;
+ dst_ptr = oasys_per_section(section)->data +
+ dst_offset;
+
+ if (src < end_src) {
+ section->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
+ }
+ while (src < end_src) {
+ uint8e_type mod_byte = *src++;
+ uint32_type gap = end_src - src;
+
+ count = 8;
+ if (mod_byte == 0 && gap >= 8) {
+ dst_ptr[0] = src[0];
+ dst_ptr[1] = src[1];
+ dst_ptr[2] = src[2];
+ dst_ptr[3] = src[3];
+ dst_ptr[4] = src[4];
+ dst_ptr[5] = src[5];
+ dst_ptr[6] = src[6];
+ dst_ptr[7] = src[7];
+ dst_ptr+= 8;
+ src += 8;
+ }
+ else {
+ for (relbit = 1; count-- != 0 && src < end_src; relbit <<=1)
+ {
+ if (relbit & mod_byte)
+ {
+ uint8e_type reloc = *src;
+ /* This item needs to be relocated */
+ switch (reloc & RELOCATION_TYPE_BITS) {
+ case RELOCATION_TYPE_ABS:
+
+ break;
+
+ 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));
+ *(per->reloc_tail_ptr) = r;
+ per->reloc_tail_ptr = &r->next;
+ r->next= (oasys_reloc_type *)NULL;
+ /* Reference to undefined symbol */
+ src++;
+ /* There is no symbol */
+ r->symbol = 0;
+ /* Work out the howto */
+ r->relent.section =
+ data->sections[reloc & RELOCATION_SECT_BITS];
+ r->relent.addend = - r->relent.section->vma;
+ r->relent.address = dst_ptr - dst_base_ptr;
+ r->relent.howto = &howto_table[reloc>>6];
+ 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;
+ }
+
+
+ }
+ break;
+
+
+ case RELOCATION_TYPE_UND:
+ {
+ oasys_reloc_type *r =
+ (oasys_reloc_type *)
+ bfd_alloc(abfd,
+ sizeof(oasys_reloc_type));
+ *(per->reloc_tail_ptr) = r;
+ per->reloc_tail_ptr = &r->next;
+ r->next= (oasys_reloc_type *)NULL;
+ /* Reference to undefined symbol */
+ src++;
+ /* Get symbol number */
+ r->symbol = (src[0]<<8) | src[1];
+ /* Work out the howto */
+ r->relent.section = (asection *)NULL;
+ r->relent.addend = 0;
+ r->relent.address = dst_ptr - dst_base_ptr;
+ r->relent.howto = &howto_table[reloc>>6];
+ r->relent.sym_ptr_ptr = (asymbol **)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;
+ }
+ }
+ break;
+ case RELOCATION_TYPE_COM:
+ BFD_FAIL();
}
- break;
- case RELOCATION_TYPE_COM:
- BFD_FAIL();
- }
- }
- *dst_ptr++ = *src++;
- }
+ }
+ *dst_ptr++ = *src++;
+ }
+ }
+ }
}
- }
+ break;
+ case oasys_record_is_local_enum:
+ case oasys_record_is_symbol_enum:
+ case oasys_record_is_section_enum:
+ break;
+ default:
+ loop = false;
}
- break;
- case oasys_record_is_local_enum:
- case oasys_record_is_symbol_enum:
- case oasys_record_is_section_enum:
- break;
- default:
- loop = false;
- }
}
+
return true;
}
oasys_per_section( newsect)->data = (bfd_byte *)NULL;
oasys_per_section(newsect)->section = newsect;
oasys_per_section(newsect)->offset = 0;
- newsect->alignment_power = 3;
+ oasys_per_section(newsect)->initialized = false;
+ newsect->alignment_power = 1;
/* Turn the section string into an index */
sscanf(newsect->name,"%u", &newsect->target_index);
DEFUN(oasys_get_section_contents,(abfd, section, location, offset, count),
bfd *abfd AND
sec_ptr section AND
- void *location AND
+ PTR location AND
file_ptr offset AND
- unsigned int count)
+ bfd_size_type count)
{
oasys_per_section_type *p = (oasys_per_section_type *) section->used_by_bfd;
oasys_slurp_section_data(abfd);
- (void) memcpy(location, p->data + offset, count);
+ if (p->initialized == false)
+ {
+ (void) memset(location, 0, (int)count);
+ }
+ else
+ {
+ (void) memcpy(location,(PTR)( p->data + offset), (int)count);
+ }
return true;
}
unsigned int
-DEFUN(oasys_canonicalize_reloc,(abfd, section, relptr, symbols),
- bfd *abfd AND
+DEFUN(oasys_canonicalize_reloc,(ignore_abfd, section, relptr, symbols),
+ bfd *ignore_abfd AND
sec_ptr section AND
arelent **relptr AND
asymbol **symbols)
if (g->flags & BSF_FORT_COMM) {
symbol.relb = RELOCATION_TYPE_COM;
- bfd_h_putshort(abfd, index, (uint8e_type *)(&symbol.refno[0]));
+ bfd_h_put_16(abfd, index, (uint8e_type *)(&symbol.refno[0]));
index++;
}
else if (g->flags & BSF_ABSOLUTE) {
symbol.relb = RELOCATION_TYPE_ABS;
- bfd_h_putshort(abfd, 0, (uint8e_type *)(&symbol.refno[0]));
+ bfd_h_put_16(abfd, 0, (uint8e_type *)(&symbol.refno[0]));
}
else if (g->flags & BSF_UNDEFINED) {
symbol.relb = RELOCATION_TYPE_UND ;
- bfd_h_putshort(abfd, index, (uint8e_type *)(&symbol.refno[0]));
+ bfd_h_put_16(abfd, index, (uint8e_type *)(&symbol.refno[0]));
/* Overload the value field with the output index number */
index++;
}
continue;
}
else {
- symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index;
- bfd_h_putshort(abfd, 0, (uint8e_type *)(&symbol.refno[0]));
+ if (g->section == (asection *)NULL) {
+ /* Sometime, the oasys tools give out a symbol with illegal
+ bits in it, we'll output it in the same broken way */
+
+ symbol.relb = RELOCATION_TYPE_REL | 0;
+ }
+ else {
+ symbol.relb = RELOCATION_TYPE_REL |g->section->output_section->target_index;
+ }
+ bfd_h_put_16(abfd, 0, (uint8e_type *)(&symbol.refno[0]));
}
while (src[l]) {
dst[l] = src[l];
l++;
}
- bfd_h_putlong(abfd, g->value, symbol.value);
+ bfd_h_put_32(abfd, g->value, (bfd_byte*) symbol.value);
if (g->flags & BSF_LOCAL) {
s->name);
}
out.relb = RELOCATION_TYPE_REL | s->target_index;
- bfd_h_putlong(abfd, s->size, out.value);
- bfd_h_putlong(abfd, s->vma, out.vma);
+ bfd_h_put_32(abfd, s->size, (bfd_byte *) out.value);
+ bfd_h_put_32(abfd, s->vma, (bfd_byte *) out.vma);
oasys_write_record(abfd,
oasys_record_is_section_enum,
bfd *CONST abfd)
{
oasys_end_record_type end;
+ uint8e_type null = 0;
end.relb = RELOCATION_TYPE_ABS;
- bfd_h_putlong(abfd, abfd->start_address, end.entry);
- bfd_h_putshort(abfd, 0, end.fill);
+ bfd_h_put_32(abfd, abfd->start_address, (bfd_byte *)end.entry);
+ bfd_h_put_16(abfd, 0, (bfd_byte *)end.fill);
end.zero =0;
oasys_write_record(abfd,
oasys_record_is_end_enum,
(oasys_record_union_type *)&end,
sizeof(end));
+ bfd_write((PTR)&null, 1, 1, abfd);
}
static int
{
asection *s;
for (s = abfd->sections; s != (asection *)NULL; s = s->next) {
- uint8e_type *raw_data = oasys_per_section(s)->data;
- oasys_data_record_type processed_data;
- unsigned int current_byte_index = 0;
- unsigned int relocs_to_go = s->reloc_count;
- arelent **p = s->orelocation;
- if (s->reloc_count != 0) {
- /* Sort the reloc records so it's easy to insert the relocs into the
- data */
+ if (s->flags & SEC_LOAD) {
+ uint8e_type *raw_data = oasys_per_section(s)->data;
+ oasys_data_record_type processed_data;
+ bfd_size_type current_byte_index = 0;
+ unsigned int relocs_to_go = s->reloc_count;
+ arelent **p = s->orelocation;
+ if (s->reloc_count != 0) {
+ /* Sort the reloc records so it's easy to insert the relocs into the
+ data */
- qsort(s->orelocation,
- s->reloc_count,
- sizeof(arelent **),
- comp);
- }
- current_byte_index = 0;
- processed_data.relb = s->target_index | RELOCATION_TYPE_REL;
+ qsort(s->orelocation,
+ s->reloc_count,
+ sizeof(arelent **),
+ comp);
+ }
+ current_byte_index = 0;
+ processed_data.relb = s->target_index | RELOCATION_TYPE_REL;
- while ((size_t)current_byte_index < s->size)
- {
- /* Scan forwards by eight bytes or however much is left and see if
- there are any relocations going on */
- uint8e_type *mod = &processed_data.data[0];
- uint8e_type *dst = &processed_data.data[1];
+ while (current_byte_index < s->size)
+ {
+ /* Scan forwards by eight bytes or however much is left and see if
+ there are any relocations going on */
+ uint8e_type *mod = &processed_data.data[0];
+ uint8e_type *dst = &processed_data.data[1];
- unsigned int i;
- unsigned int long_length = 128;
+ unsigned int i;
+ unsigned int long_length = 128;
- bfd_h_putlong(abfd, s->vma + current_byte_index, processed_data.addr);
- if ((size_t)(long_length + current_byte_index) > (size_t)(s->size)) {
- long_length = s->size - current_byte_index;
- }
- while (long_length > 0 && (dst - (uint8e_type*)&processed_data < 128)) {
+ bfd_h_put_32(abfd, s->vma + current_byte_index, processed_data.addr);
+ if ((size_t)(long_length + current_byte_index) > (size_t)(s->size)) {
+ long_length = s->size - current_byte_index;
+ }
+ while (long_length > 0 && (dst - (uint8e_type*)&processed_data < 128)) {
- unsigned int length = long_length;
- *mod =0;
- if (length > 8)
- length = 8;
-
- for (i = 0; i < length; i++) {
- if (relocs_to_go != 0) {
- arelent *r = *p;
- reloc_howto_type *CONST how=r->howto;
- /* There is a relocation, is it for this byte ? */
- if (r->address == current_byte_index) {
- uint8e_type rel_byte;
- p++;
- relocs_to_go--;
-
- *mod |= (1<<i);
- if(how->pc_relative) {
- rel_byte = 0x80;
-
- /* Also patch the raw data so that it doesn't have
- the -ve stuff any more */
- if (how->size != 2) {
- bfd_putshort(abfd,
- bfd_getshort(abfd,raw_data) +
+ unsigned int length = long_length;
+ *mod =0;
+ if (length > 8)
+ length = 8;
+
+ for (i = 0; i < length; i++) {
+ if (relocs_to_go != 0) {
+ arelent *r = *p;
+ reloc_howto_type *CONST how=r->howto;
+ /* There is a relocation, is it for this byte ? */
+ if (r->address == current_byte_index) {
+ uint8e_type rel_byte;
+ p++;
+ relocs_to_go--;
+
+ *mod |= (1<<i);
+ if(how->pc_relative) {
+ rel_byte = 0x80;
+
+ /* Also patch the raw data so that it doesn't have
+ the -ve stuff any more */
+ if (how->size != 2) {
+ bfd_put_16(abfd,
+ bfd_get_16(abfd,raw_data) +
current_byte_index, raw_data);
- }
+ }
+ else {
+ bfd_put_32(abfd,
+ bfd_get_32(abfd,raw_data) +
+ current_byte_index, raw_data);
+ }
+ }
else {
- bfd_putlong(abfd,
- bfd_getlong(abfd,raw_data) +
- current_byte_index, raw_data);
+ rel_byte = 0;
+ }
+ if (how->size ==2) {
+ rel_byte |= 0x40;
}
- }
- else {
- rel_byte = 0;
- }
- if (how->size ==2) {
- rel_byte |= 0x40;
- }
- /* Is this a section relative relocation, or a symbol
- relative relocation ? */
- if (r->section != (asection*)NULL)
- {
- /* The relent has a section attatched, so it must be section
- relative */
- rel_byte |= RELOCATION_TYPE_REL;
- rel_byte |= r->section->output_section->target_index;
- *dst++ = rel_byte;
- }
- else
- {
- asymbol *p = *(r->sym_ptr_ptr);
-
- /* If this symbol has a section attatched, then it
- has already been resolved. Change from a symbol
- ref to a section ref */
- if(p->section != (asection *)NULL) {
+ /* Is this a section relative relocation, or a symbol
+ relative relocation ? */
+ if (r->section != (asection*)NULL)
+ {
+ /* The relent has a section attached, so it must be section
+ relative */
rel_byte |= RELOCATION_TYPE_REL;
- rel_byte |=
- p->section->output_section->target_index;
+ rel_byte |= r->section->output_section->target_index;
*dst++ = rel_byte;
}
- else {
- rel_byte |= RELOCATION_TYPE_UND;
+ else
+ {
+ asymbol *p = *(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) {
+ rel_byte |= RELOCATION_TYPE_REL;
+ rel_byte |=
+ p->section->output_section->target_index;
+ *dst++ = rel_byte;
+ }
+ else {
+ rel_byte |= RELOCATION_TYPE_UND;
- *dst++ = rel_byte;
- /* Next two bytes are a symbol index - we can get
- this from the symbol value which has been zapped
- into the symbol index in the table when the
- symbol table was written
- */
- *dst++ = p->value >> 8;
- *dst++ = p->value;
- }
+ *dst++ = rel_byte;
+ /* Next two bytes are a symbol index - we can get
+ this from the symbol value which has been zapped
+ into the symbol index in the table when the
+ symbol table was written
+ */
+ *dst++ = p->value >> 8;
+ *dst++ = p->value;
+ }
- }
+ }
+ }
}
+ /* If this is coming from an unloadable section then copy
+ zeros */
+ if (raw_data == (uint8e_type *)NULL) {
+ *dst++ = 0;
+ }
+ else {
+ *dst++ = *raw_data++;
+ }
+ current_byte_index++;
}
- /* If this is coming from an unloadable section then copy
- zeros */
- if (raw_data == (uint8e_type *)NULL) {
- *dst++ = 0;
- }
- else {
- *dst++ = *raw_data++;
- }
- current_byte_index++;
+ mod = dst++;
+ long_length -= length;
}
- mod = dst++;
- long_length -= length;
- }
- oasys_write_record(abfd,
- oasys_record_is_data_enum,
- (oasys_record_union_type *)&processed_data,
- dst - (uint8e_type*)&processed_data);
+ oasys_write_record(abfd,
+ oasys_record_is_data_enum,
+ (oasys_record_union_type *)&processed_data,
+ dst - (uint8e_type*)&processed_data);
- }
+ }
+ }
}
}
static boolean
DEFUN(oasys_set_section_contents,(abfd, section, location, offset, count),
bfd *abfd AND
sec_ptr section AND
- unsigned char *location AND
+ PTR location AND
file_ptr offset AND
- int count)
+ bfd_size_type count)
{
if (count != 0) {
if (oasys_per_section(section)->data == (bfd_byte *)NULL )
oasys_per_section(section)->data =
(bfd_byte *)(bfd_alloc(abfd,section->size));
}
- (void) memcpy(oasys_per_section(section)->data + offset,
+ (void) memcpy((PTR)(oasys_per_section(section)->data + offset),
location,
count);
}
\f
-/* Obsbolete procedural interface; better to look at the cache directly */
/* User should have checked the file flags; perhaps we should return
BFD_NO_MORE_SYMBOLS if there are none? */
-
-
-boolean
-oasys_close_and_cleanup (abfd)
-bfd *abfd;
-{
- if (bfd_read_p (abfd) == false)
- switch (abfd->format) {
- case bfd_archive:
- if (!_bfd_write_archive_contents (abfd)) {
- return false;
- }
- break;
- case bfd_object:
- if (!oasys_write_object_contents (abfd)) {
- return false;
- }
- break;
- default:
- bfd_error = invalid_operation;
- return false;
- }
-
-
-
- return true;
-}
-
static bfd *
oasys_openr_next_archived_file(arch, prev)
bfd *arch;
}
static int
-DEFUN(oasys_sizeof_headers,(abfd),
- bfd *abfd)
+DEFUN(oasys_sizeof_headers,(abfd, exec),
+ bfd *abfd AND
+ boolean exec)
{
return 0;
}
-
-#define oasys_core_file_failing_command bfd_false
-#define oasys_core_file_failing_signal bfd_false
-#define oasys_core_file_matches_executable_p bfd_false
-#define oasys_slurp_armap bfd_false
-#define oasys_slurp_extended_name_table bfd_false
-#define oasys_truncate_arname bfd_false
-#define oasys_write_armap bfd_false
-#define oasys_get_lineno bfd_false
-
+#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_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_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
/*SUPPRESS 460 */
|SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
' ', /* ar_pad_char */
16, /* ar_max_namelen */
-
- _do_getblong, _do_putblong, _do_getbshort, _do_putbshort, /* data */
- _do_getblong, _do_putblong, _do_getbshort, _do_putbshort, /* hdrs */
-
- {_bfd_dummy_target,
- oasys_object_p, /* bfd_check_format */
- oasys_archive_p,
- bfd_false
+ 1, /* minimum alignment */
+ _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* data */
+ _do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */
+
+ {_bfd_dummy_target,
+ oasys_object_p, /* bfd_check_format */
+ oasys_archive_p,
+ _bfd_dummy_target,
},
- {
- bfd_false,
- oasys_mkobject,
- _bfd_generic_mkarchive,
- bfd_false
+ { /* bfd_set_format */
+ bfd_false,
+ oasys_mkobject,
+ _bfd_generic_mkarchive,
+ bfd_false
+ },
+ { /* bfd_write_contents */
+ bfd_false,
+ oasys_write_object_contents,
+ _bfd_write_archive_contents,
+ bfd_false,
},
-JUMP_TABLE(oasys)
+ JUMP_TABLE(oasys)
};
projects / binutils.git / blobdiff