Initial revision

[thirdparty/binutils-gdb.git] / bfd / coff-i960.c

diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
index b80c80dd0544ec02ef4360ddcbada8772718ef62..4c3b7e102d7b59931295d46df06c13e244788491 100644 (file)
--- a/bfd/coff-i960.c
+++ b/bfd/coff-i960.c
@@ -24,7 +24,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define BADMAG(x) I960BADMAG(x)
 
 #include <ansidecl.h>
-#include "sysdep.h"
+#include <sysdep.h>
 #include "bfd.h"
 #include "libbfd.h"
 #include "obstack.h"
@@ -62,25 +62,25 @@ asection *ignore_input_section;
      result = bfd_reloc_dangerous;
   }
   else  {
-    switch (bfd_h_get_x(abfd, & cs->native->n_sclass)) 
+    switch (cs->native->n_sclass) 
       {
       case C_LEAFSTAT:
       case C_LEAFEXT:
        /* This is a call to a leaf procedure, replace instruction with a bal
         to the correct location */
        {
-        AUXENT *aux = (AUXENT *)(cs->native+2);
-         int word = bfd_getlong(abfd, data + reloc_entry->address);
-         BFD_ASSERT(bfd_h_get_x(abfd, &cs->native->n_numaux)==2);
+         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 + (bfd_h_get_x(abfd, &aux->x_bal.x_balntry) -
-                          bfd_h_get_x(abfd, &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;
@@ -139,9 +139,9 @@ static reloc_howto_type howto_table[] =
 
 };
 
-/* The real code is in coff-code.h */
+/* The real code is in coffcode.h */
 
-#include "coff-code.h"
+#include "coffcode.h"
 
 bfd_target icoff_little_vec =
 {
@@ -158,18 +158,17 @@ 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},
+  _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 =
@@ -187,12 +186,15 @@ 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},
+_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 */
 
-  JUMP_TABLE(coff)
+  {_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
 };
-