Thu Nov 30 11:17:33 1995 Manfred Hollstein KS/EF4A 60/1F/110 #40283 <manfred@lts...
authorIan Lance Taylor <ian@airs.com>
Thu, 30 Nov 1995 16:23:05 +0000 (16:23 +0000)
committerIan Lance Taylor <ian@airs.com>
Thu, 30 Nov 1995 16:23:05 +0000 (16:23 +0000)
* coff-m88k.c (howto_table): Reformatted for easier reading;
special_function now points to new function m88k_special_reloc.
(howto_hvrt16): Function previously used for handling HVRT16 relocs
removed.
(rtype2howto): Do not add reloc's r_offset to the addend, this will
be done correctly by m88k_special_reloc.
(reloc_processing): New function to be used by RELOC_PROCESSING.
(RELOC_PROCESSING): Define to call reloc_processing.

bfd/ChangeLog
bfd/coff-m88k.c

index 23b0ca7657bcb1f1a6d5ced0d1ac54c165713b09..8faec572ef9435fe37db5bb7b142e9ec51ee17a9 100644 (file)
@@ -1,3 +1,14 @@
+Thu Nov 30 11:17:33 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
+
+       * coff-m88k.c (howto_table): Reformatted for easier reading;
+       special_function now points to new function m88k_special_reloc.
+       (howto_hvrt16): Function previously used for handling HVRT16 relocs
+       removed.
+       (rtype2howto): Do not add reloc's r_offset to the addend, this will
+       be done correctly by m88k_special_reloc.
+       (reloc_processing): New function to be used by RELOC_PROCESSING.
+       (RELOC_PROCESSING): Define to call reloc_processing.
+
 Wed Nov 29 12:42:36 1995  Ian Lance Taylor  <ian@cygnus.com>
 
        * peicode.h (pe_print_idata): Call malloc rather than xmalloc.
index aa0d8ea7f10c64e4b68293f7235dce4b359212d0..b00cfde5b658cb2ec57c3161ed347e113e3f32e0 100644 (file)
@@ -1,5 +1,5 @@
 /* BFD back-end for Motorola 88000 COFF "Binary Compatability Standard" files.
-   Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define M88 1          /* Customize various include files */
 #include "bfd.h"
@@ -26,85 +26,249 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #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 (bfd_is_com_section (symbol->section)) { \
-      relocation = 0;                          \
-    }                                          \
-    else {                                     \
-      relocation = symbol->value;              \
-    }                                          \
-  }                                            \
-  if (symbol->section != (asection *)NULL) {   \
-    relocation += symbol->section->output_section->vma +       \
-      symbol->section->output_offset;          \
-  }                                            \
-}                      
 
+static bfd_reloc_status_type m88k_special_reloc
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
+static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 
 static bfd_reloc_status_type 
-howto_hvrt16 (abfd, reloc_entry, symbol_in, data,
-                   ignore_input_section, ignore_bfd, error_message)
+m88k_special_reloc (abfd, reloc_entry, symbol, data,
+                   input_section, output_bfd, error_message)
      bfd *abfd;
      arelent *reloc_entry;
-     asymbol *symbol_in;
+     asymbol *symbol;
      PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
+     asection *input_section;
+     bfd *output_bfd;
      char **error_message;
 {
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
+  reloc_howto_type *howto = reloc_entry->howto;
 
-  HOWTO_PREPARE(relocation, symbol_in);
+  switch (howto->type)
+    {
+    case R_HVRT16:
+    case R_LVRT16:
+      if (output_bfd != (bfd *) NULL)
+       {
+         /* This is a partial relocation, and we want to apply the
+            relocation to the reloc entry rather than the raw data.
+            Modify the reloc inplace to reflect what we now know.  */
 
-  x = (x + relocation + reloc_entry->addend) >> 16;
+         reloc_entry->address += input_section->output_offset;
+       }
+      else
+       {
+         bfd_vma output_base = 0;
+         bfd_vma addr = reloc_entry->address;
+         bfd_vma x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
+         asection *reloc_target_output_section;
+         long relocation = 0;
 
-  bfd_put_16(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
+         /* Work out which section the relocation is targetted at and the
+            initial relocation command value.  */
+
+         /* Get symbol value.  (Common symbols are special.)  */
+         if (bfd_is_com_section (symbol->section))
+           relocation = 0;
+         else
+           relocation = symbol->value;
+
+         reloc_target_output_section = symbol->section->output_section;
+
+         /* Convert input-section-relative symbol value to absolute.  */
+         if (output_bfd)
+           output_base = 0;
+         else
+           output_base = reloc_target_output_section->vma;
+
+         relocation += output_base + symbol->section->output_offset;
+
+         /* Add in supplied addend.  */
+         relocation += ((reloc_entry->addend << howto->bitsize) + x);
+
+         reloc_entry->addend = 0;
 
+         relocation >>= (bfd_vma) howto->rightshift;
 
+         /* Shift everything up to where it's going to be used */
+
+         relocation <<= (bfd_vma) howto->bitpos;
+
+         if (relocation)
+             bfd_put_16 (abfd, relocation, (unsigned char *) data + addr);
+       }
+
+      return bfd_reloc_ok;
+      break;
+
+    default:
+      if (output_bfd != (bfd *) NULL)
+       {
+         /* This is a partial relocation, and we want to apply the
+            relocation to the reloc entry rather than the raw data.
+            Modify the reloc inplace to reflect what we now know.  */
+
+         reloc_entry->address += input_section->output_offset;
+         return bfd_reloc_ok;
+       }
+      break;
+    }
+
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  return bfd_reloc_ok;
+}
 
 static reloc_howto_type howto_table[] = 
 {
-  HOWTO(R_PCR16L,02,1,16,true, 0,complain_overflow_signed, 0, "PCR16L",false,0x0000ffff,0x0000ffff,true),
-  HOWTO(R_PCR26L,02,2,26,true, 0,complain_overflow_signed, 0, "PCR26L",false,0x03ffffff,0x03ffffff,true),
-  HOWTO(R_VRT16, 00,1,16,false,0,complain_overflow_bitfield, 0, "VRT16", false,0x0000ffff,0x0000ffff,true),
-  HOWTO(R_HVRT16,16,1,16,false,0,complain_overflow_dont,howto_hvrt16,"HVRT16",false,0x0000ffff,0x0000ffff,true),
-  HOWTO(R_LVRT16,00,1,16,false,0,complain_overflow_dont, 0, "LVRT16",false,0x0000ffff,0x0000ffff,true),
-  HOWTO(R_VRT32, 00,2,32,false,0,complain_overflow_bitfield, 0, "VRT32", false,0xffffffff,0xffffffff,true),
+  HOWTO (R_PCR16L,                     /* type */
+        02,                            /* rightshift */
+        1,                             /* size (0 = byte, 1 = short, 2 = long) */
+        16,                            /* bitsize */
+        true,                          /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_signed,      /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "PCR16L",                      /* name */
+        false,                         /* partial_inplace */
+        0x0000ffff,                    /* src_mask */
+        0x0000ffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
+
+  HOWTO (R_PCR26L,                     /* type */
+        02,                            /* rightshift */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        26,                            /* bitsize */
+        true,                          /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_signed,      /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "PCR26L",                      /* name */
+        false,                         /* partial_inplace */
+        0x03ffffff,                    /* src_mask */
+        0x03ffffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
+
+  HOWTO (R_VRT16,                      /* type */
+        00,                            /* rightshift */
+        1,                             /* size (0 = byte, 1 = short, 2 = long) */
+        16,                            /* bitsize */
+        false,                         /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_bitfield,    /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "VRT16",                       /* name */
+        false,                         /* partial_inplace */
+        0x0000ffff,                    /* src_mask */
+        0x0000ffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
+
+  HOWTO (R_HVRT16,                     /* type */
+        16,                            /* rightshift */
+        1,                             /* size (0 = byte, 1 = short, 2 = long) */
+        16,                            /* bitsize */
+        false,                         /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_dont,        /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "HVRT16",                      /* name */
+        false,                         /* partial_inplace */
+        0x0000ffff,                    /* src_mask */
+        0x0000ffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
+
+  HOWTO (R_LVRT16,                     /* type */
+        00,                            /* rightshift */
+        1,                             /* size (0 = byte, 1 = short, 2 = long) */
+        16,                            /* bitsize */
+        false,                         /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_dont,        /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "LVRT16",                      /* name */
+        false,                         /* partial_inplace */
+        0x0000ffff,                    /* src_mask */
+        0x0000ffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
+
+  HOWTO (R_VRT32,                      /* type */
+        00,                            /* rightshift */
+        2,                             /* size (0 = byte, 1 = short, 2 = long) */
+        32,                            /* bitsize */
+        false,                         /* pc_relative */
+        0,                             /* bitpos */
+        complain_overflow_bitfield,    /* complain_on_overflow */
+        m88k_special_reloc,            /* special_function */
+        "VRT32",                       /* name */
+        false,                         /* partial_inplace */
+        0xffffffff,                    /* src_mask */
+        0xffffffff,                    /* dst_mask */
+        true),                         /* pcrel_offset */
 };
 
+/* Code to turn an external r_type into a pointer to an entry in the
+   above howto table.  */
+static void
+rtype2howto (cache_ptr, dst)
+     arelent *cache_ptr;
+     struct internal_reloc *dst;
+{
+  if (dst->r_type >= R_PCR16L && dst->r_type <= R_VRT32)
+    {
+      cache_ptr->howto = howto_table + dst->r_type - R_PCR16L;
+    }
+  else
+    {
+      BFD_ASSERT (0);
+    }
+}
+
+#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
+
 
 /* Code to swap in the reloc offset */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_16
+#define SWAP_IN_RELOC_OFFSET  bfd_h_get_16
 #define SWAP_OUT_RELOC_OFFSET bfd_h_put_16
 
 
-/* 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 RELOC_PROCESSING(relent,reloc,symbols,abfd,section)    \
+  reloc_processing(relent, reloc, symbols, abfd, section)
 
+static void
+reloc_processing (relent, reloc, symbols, abfd, section)
+     arelent *relent;
+     struct internal_reloc *reloc;
+     asymbol **symbols;
+     bfd *abfd;
+     asection *section;
+{
+  relent->address = reloc->r_vaddr;
+  rtype2howto (relent, reloc);
 
+  if (((int) reloc->r_symndx) > 0)
+    {
+      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
+    }
+  else
+    {
+      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+    }
+
+  relent->addend = reloc->r_offset;
+  relent->address -= section->vma;
+}
 
 #define BADMAG(x) MC88BADMAG(x)
 #include "coffcode.h"
 
 #undef coff_write_armap
 
-bfd_target m88kbcs_vec =
+const bfd_target m88kbcs_vec =
 {
   "coff-m88kbcs",              /* name */
   bfd_target_coff_flavour,
@@ -119,7 +283,6 @@ bfd_target m88kbcs_vec =
   '_',                         /* leading underscore */
   '/',                         /* ar_pad_char */
   15,                          /* ar_max_namelen */
-  3,                           /* default alignment power */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
      bfd_getb32, bfd_getb_signed_32, bfd_putb32,
      bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
@@ -142,6 +305,7 @@ bfd_target m88kbcs_vec =
      BFD_JUMP_TABLE_RELOCS (coff),
      BFD_JUMP_TABLE_WRITE (coff),
      BFD_JUMP_TABLE_LINK (coff),
+     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   COFF_SWAP_TABLE,
 };