* libbfd.c: bfd_put*: Remove casts to bfd_vma.

[binutils-gdb.git] / bfd / coff-m88k.c

diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
index 71a4497ea8c03a322626bf766e5f0c3e8d8d7a99..1696a857692cc009ee94cfec59d72377e6b2e888 100644 (file)
--- a/bfd/coff-m88k.c
+++ b/bfd/coff-m88k.c
@@ -1,38 +1,37 @@
-/* Copyright (C) 1990, 1991 Free Software Foundation, Inc.
+/* Motorola 88000 COFF support ("Binary Compatability Standard") for BFD.
+   Copyright (C) 1990-1991 Free Software Foundation, Inc.
+   Written by Cygnus Support.
 
-This file is part of BFD, the Binary File Diddler.
+This file is part of BFD, the Binary File Descriptor library.
 
-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 M88 1
-#include <ansidecl.h>
-#include <sysdep.h>
+#define M88 1          /* Customize various include files */
 #include "bfd.h"
+#include "sysdep.h"
 #include "libbfd.h"
 #include "obstack.h"
-#include "m88k-bcs.h"
+#include "coff/m88k.h"
+#include "coff/internal.h"
 #include "libcoff.h"
-
+#undef HOWTO_PREPARE
 /* Provided the symbol, returns the value reffed */
 #define HOWTO_PREPARE(relocation, symbol)      \
   {                                            \
   if (symbol != (asymbol *)NULL) {             \
-    if (symbol->flags & BSF_FORT_COMM) {       \
+    if (symbol->section == &bfd_com_section) { \
       relocation = 0;                          \
     }                                          \
     else {                                     \
@@ -47,15 +46,17 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 
 
-static bfd_reloc_status_enum_type 
-DEFUN(howto_hvrt16,(abfd, reloc_entry, symbol_in, data, ignore_input_section),
-bfd *abfd AND
-arelent *reloc_entry AND
-asymbol *symbol_in AND
-unsigned char *data AND
-asection *ignore_input_section)
+static bfd_reloc_status_type 
+DEFUN(howto_hvrt16,(abfd, reloc_entry, symbol_in, data,
+                   ignore_input_section, ignore_bfd),
+      bfd *abfd AND
+      arelent *reloc_entry AND
+      asymbol *symbol_in AND
+      PTR data AND
+      asection *ignore_input_section AND
+      bfd *ignore_bfd)
 {
-  long relocation;
+  long relocation = 0;
   bfd_vma addr = reloc_entry->address;
   long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
 
@@ -80,20 +81,33 @@ static reloc_howto_type howto_table[] =
 };
 
 
+/* Code to swap in the reloc offset */
+#define SWAP_IN_RELOC_OFFSET   bfd_h_get_16
+#define SWAP_OUT_RELOC_OFFSET bfd_h_put_16
 
-#define BADMAG(x) MC88BADMAG(x)
-#include "coff-code.h"
 
+/* Code to turn an external r_type into a pointer to an entry in the
+   above howto table */
+#define RTYPE2HOWTO(cache_ptr, dst)                                    \
+           if ((dst)->r_type >= R_PCR16L && (dst)->r_type <= R_VRT32) {\
+               cache_ptr->howto = howto_table + (dst)->r_type - R_PCR16L;\
+               cache_ptr->addend += (dst)->r_offset << 16;             \
+           }                                                           \
+           else {                                                      \
+               BFD_ASSERT(0);                                          \
+           }
 
 
 
-#define coff_write_armap bsd_write_armap
+#define BADMAG(x) MC88BADMAG(x)
+#include "coffcode.h"
 
+#undef coff_write_armap
 
-bfd_target m88k_bcs_vec =
+bfd_target m88kbcs_vec =
 {
-  "m88kbcs",           /* name */
-  bfd_target_coff_flavour_enum,
+  "coff-m88kbcs",              /* name */
+  bfd_target_coff_flavour,
   true,                                /* data byte order is big */
   true,                                /* header byte order is big */
 
@@ -102,18 +116,20 @@ bfd_target m88k_bcs_vec =
    HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT),
 
   (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  0,                           /* leading underscore */
   '/',                         /* ar_pad_char */
   15,                          /* ar_max_namelen */
-
-_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, 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},
-  {bfd_false, coff_write_object_contents,      /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  JUMP_TABLE(coff)
+  3,                           /* default alignment power */
+  _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, 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},
+    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
+       _bfd_write_archive_contents, bfd_false},
+
+  JUMP_TABLE(coff),
+  COFF_SWAP_TABLE
 };