+/* 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;
{15},
{16},
- { (unsigned int) R_RELLONG, 0, 2, 32,false, 0, true, true, 0,"rellong", true, 0xffffffff},
+ { (unsigned int) R_RELLONG, 0, 2, 32,false, 0, true, true,
+ 0,"rellong", true, 0xffffffff, 0xffffffff},
{18},
{19},
{20},
{23},
{24},
- { R_IPRMED, 0, 2, 24,true,0, true, true,0,"iprmed ", true, 0x00ffffff},
+ { R_IPRMED, 0, 2, 24,true,0, true, true,0,"iprmed ", true,
+ 0x00ffffff, 0x00ffffff},
{26},
- { R_OPTCALL, 0,2,24,true,0, true, true, optcall_callback, "optcall", true, 0x00ffffff},
+ { R_OPTCALL, 0,2,24,true,0, true, true, optcall_callback,
+ "optcall", true, 0x00ffffff, 0x00ffffff},
};
+/* The real code is in coffcode.h */
+#include "coffcode.h"
-#define BADMAG(x) I960BADMAG(x)
-#include "coff-code.h"
-
-
-
-bfd_target icoff_big_vec =
+bfd_target icoff_little_vec =
{
- "coff-Intel-big", /* name */
+ "coff-Intel-little", /* name */
bfd_target_coff_flavour_enum,
false, /* data byte order is little */
- true, /* header byte order is big */
+ false, /* header byte order is little */
(HAS_RELOC | EXEC_P | /* object flags */
HAS_LINENO | HAS_DEBUG |
HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT),
(SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
- 0, /* valid reloc types */
'/', /* ar_pad_char */
15, /* ar_max_namelen */
- coff_close_and_cleanup, /* _close_and_cleanup */
- coff_set_section_contents, /* bfd_set_section_contents */
- coff_get_section_contents, /* bfd_get_section_contents */
- coff_new_section_hook, /* new_section_hook */
- _bfd_dummy_core_file_failing_command, /* _core_file_failing_command */
- _bfd_dummy_core_file_failing_signal, /* _core_file_failing_signal */
- _bfd_dummy_core_file_matches_executable_p, /* _core_file_matches_ex...p */
-
- bfd_slurp_coff_armap, /* bfd_slurp_armap */
- _bfd_slurp_extended_name_table, /* bfd_slurp_extended_name_table*/
-#if 0 /* */
- bfd_dont_truncate_arname, /* bfd_truncate_arname */
-#else
- bfd_bsd_truncate_arname,
-#endif
-
- coff_get_symtab_upper_bound, /* get_symtab_upper_bound */
- coff_get_symtab, /* canonicalize_symtab */
- (void (*)())bfd_false, /* bfd_reclaim_symbol_table */
- coff_get_reloc_upper_bound, /* get_reloc_upper_bound */
- coff_canonicalize_reloc, /* bfd_canonicalize_reloc */
- (void (*)())bfd_false, /* bfd_reclaim_reloc */
-
- coff_get_symcount_upper_bound, /* bfd_get_symcount_upper_bound */
- coff_get_first_symbol, /* bfd_get_first_symbol */
- coff_get_next_symbol, /* bfd_get_next_symbol */
- coff_classify_symbol, /* bfd_classify_symbol */
- coff_symbol_hasclass, /* bfd_symbol_hasclass */
- coff_symbol_name, /* bfd_symbol_name */
- coff_symbol_value, /* bfd_symbol_value */
-
- _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_check_format */
- bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
- bfd_false},
- coff_make_empty_symbol,
- coff_print_symbol,
- coff_get_lineno,
- coff_set_arch_mach,
- coff_write_armap,
- bfd_generic_openr_next_archived_file,
- coff_find_nearest_line,
- bfd_generic_stat_arch_elt /* bfd_stat_arch_elt */
- };
+ _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_little_vec =
+bfd_target icoff_big_vec =
{
- "coff-Intel-little", /* name */
+ "coff-Intel-big", /* name */
bfd_target_coff_flavour_enum,
false, /* data byte order is little */
- false, /* header byte order is little */
+ true, /* header byte order is big */
(HAS_RELOC | EXEC_P | /* object flags */
HAS_LINENO | HAS_DEBUG |
HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT),
(SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
- 0, /* valid reloc types */
'/', /* ar_pad_char */
15, /* ar_max_namelen */
- coff_close_and_cleanup, /* _close_and_cleanup */
- coff_set_section_contents, /* bfd_set_section_contents */
- coff_get_section_contents, /* bfd_get_section_contents */
- coff_new_section_hook, /* new_section_hook */
- _bfd_dummy_core_file_failing_command, /* _core_file_failing_command */
- _bfd_dummy_core_file_failing_signal, /* _core_file_failing_signal */
- _bfd_dummy_core_file_matches_executable_p, /* _core_file_matches_ex...p */
-
- bfd_slurp_coff_armap, /* bfd_slurp_armap */
- _bfd_slurp_extended_name_table, /* bfd_slurp_extended_name_table*/
-#if 1 /* */
- bfd_dont_truncate_arname, /* bfd_truncate_arname */
-#else
- bfd_bsd_truncate_arname,
-#endif
- coff_get_symtab_upper_bound, /* get_symtab_upper_bound */
- coff_get_symtab, /* canonicalize_symtab */
- (void (*)())bfd_false, /* bfd_reclaim_symbol_table */
- coff_get_reloc_upper_bound, /* get_reloc_upper_bound */
- coff_canonicalize_reloc, /* bfd_canonicalize_reloc */
- (void (*)())bfd_false, /* bfd_reclaim_reloc */
-
- coff_get_symcount_upper_bound, /* bfd_get_symcount_upper_bound */
- coff_get_first_symbol, /* bfd_get_first_symbol */
- coff_get_next_symbol, /* bfd_get_next_symbol */
- coff_classify_symbol, /* bfd_classify_symbol */
- coff_symbol_hasclass, /* bfd_symbol_hasclass */
- coff_symbol_name, /* bfd_symbol_name */
- coff_symbol_value, /* bfd_symbol_value */
-
- _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* data */
- _do_getllong, _do_putllong, _do_getlshort, _do_putlshort, /* hdrs */
+
+_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},
- coff_make_empty_symbol,
- coff_print_symbol,
- coff_get_lineno,
- coff_set_arch_mach,
- coff_write_armap,
- bfd_generic_openr_next_archived_file,
- coff_find_nearest_line,
- bfd_generic_stat_arch_elt /* bfd_stat_arch_elt */
+ {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+ _bfd_write_archive_contents, bfd_false},
+ JUMP_TABLE(coff),
+COFF_SWAP_TABLE
};
-
-