+/* Intel 960 COFF support for BFD. */
+
/* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
This file is part of BFD, the Binary File Diddler.
/* $Id$ */
#define I960 1
+#define BADMAG(x) I960BADMAG(x)
+
#include <ansidecl.h>
-#include "sysdep.h"
+#include <sysdep.h>
#include "bfd.h"
#include "libbfd.h"
#include "obstack.h"
+#include "intel-coff.h"
#include "libcoff.h" /* to allow easier abstraction-breaking */
-
-#include "intel-coff.h"
-
#define CALLS 0x66003800 /* Template for 'calls' instruction */
#define BAL 0x0b000000 /* Template for 'bal' instruction */
#define BAL_MASK 0x00ffffff
bfd_reloc_status_enum_type result;
coff_symbol_type *cs = coffsymbol(symbol_in);
- /* So the target symbol has to be off coff type, and the symbol
- has to have the correct native information within it
- */
+ /* So the target symbol has to be of coff type, and the symbol
+ has to have the correct native information within it */
if ((cs->symbol.the_bfd->xvec->flavour != bfd_target_coff_flavour_enum)
- || (cs->native == (struct syment *)NULL)) {
+ || (cs->native == (struct internal_syment *)NULL)) {
/* This is interesting, consider the case where we're outputting */
/* coff from a mix n match input, linking from coff to a symbol */
/* defined in a bout file will cause this match to be true. Should */
/* I complain ? - This will only work if the bout symbol is non */
/* leaf. */
result = bfd_reloc_dangerous;
-
}
else {
switch (cs->native->n_sclass)
/* This is a call to a leaf procedure, replace instruction with a bal
to the correct location */
{
- union auxent *aux = (union auxent *)(cs->native+2);
- int word = bfd_getlong(abfd, data + reloc_entry->address);
+ union internal_auxent *aux = (union internal_auxent *)(cs->native+2);
+ int word = bfd_get_32(abfd, data + reloc_entry->address);
+ int olf = (aux->x_bal.x_balntry - cs->native->n_value);
BFD_ASSERT(cs->native->n_numaux==2);
/* We replace the original call instruction with a bal to */
/* the bal entry point - the offset of which is described in the */
/* 2nd auxent of the original symbol. We keep the native sym and */
/* auxents untouched, so the delta between the two is the */
/* offset of the bal entry point */
- word = ((word + (aux->x_bal.x_balntry - cs->native->n_value))
- & BAL_MASK) | BAL;
- bfd_putlong(abfd, word, data+reloc_entry->address);
+
+ word = ((word + olf) & BAL_MASK) | BAL;
+ bfd_put_32(abfd, word, data+reloc_entry->address);
}
result = bfd_reloc_ok;
break;
};
+/* The real code is in coffcode.h */
-
-#define BADMAG(x) I960BADMAG(x)
-#include "coff-code.h"
+#include "coffcode.h"
bfd_target icoff_little_vec =
{
'/', /* ar_pad_char */
15, /* ar_max_namelen */
- _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* data */
- _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
- bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, /* bfd_set_format */
- _bfd_generic_mkarchive, bfd_false},
-JUMP_TABLE(coff)
-};
-
+ _do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* data */
+ _do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* hdrs */
+ {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+ bfd_generic_archive_p, _bfd_dummy_target},
+ {bfd_false, coff_mkobject, /* bfd_set_format */
+ _bfd_generic_mkarchive, bfd_false},
+ {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+ _bfd_write_archive_contents, bfd_false},
+ JUMP_TABLE(coff)
+ };
bfd_target icoff_big_vec =
'/', /* ar_pad_char */
15, /* ar_max_namelen */
- _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* data */
- _do_getblong, _do_putblong, _do_getbshort, _do_putbshort, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false},
- JUMP_TABLE(coff)
- };
+_do_getl64, _do_putl64, _do_getl32, _do_putl32, _do_getl16, _do_putl16, /* data */
+_do_getb64, _do_putb64, _do_getb32, _do_putb32, _do_getb16, _do_putb16, /* hdrs */
+ {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
+ bfd_generic_archive_p, _bfd_dummy_target},
+ {bfd_false, coff_mkobject, /* bfd_set_format */
+ _bfd_generic_mkarchive, bfd_false},
+ {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+ _bfd_write_archive_contents, bfd_false},
+ JUMP_TABLE(coff),
+COFF_SWAP_TABLE
+};