Changeset 609 for branches/GNU/src/binutils/bfd/coff-z8k.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/coff-z8k.c (modified) (11 diffs, 1 prop)

branches/GNU/src/binutils/bfd/coff-z8k.c

@@ -1 +1 @@
 /* BFD back-end for Zilog Z800n COFF binaries.
-   Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001
+   Copyright 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by Cygnus Support.
@@ -29 +29 @@
 #include "libcoff.h"
 
+static void extra_case PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *, bfd_byte *, unsigned int *, unsigned int *));
+static void reloc_processing PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
+static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+static int coff_z8k_select_reloc PARAMS ((reloc_howto_type *));
+
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
 
 static reloc_howto_type r_imm32 =
-HOWTO (R_IMM32, 0, 1, 32, false, 0,
-       complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff,
-       0xffffffff, false);
+HOWTO (R_IMM32, 0, 2, 32, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm32", TRUE, 0xffffffff,
+       0xffffffff, FALSE);
 
 static reloc_howto_type r_imm4l =
-HOWTO (R_IMM4L, 0, 1, 4, false, 0,
-       complain_overflow_bitfield, 0, "r_imm4l", true, 0xf, 0xf, false);
+HOWTO (R_IMM4L, 0, 0, 4, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm4l", TRUE, 0xf, 0xf, FALSE);
 
 static reloc_howto_type r_da =
-HOWTO (R_IMM16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_da", true, 0x0000ffff, 0x0000ffff,
-       false);
+HOWTO (R_IMM16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_da", TRUE, 0x0000ffff, 0x0000ffff,
+       FALSE);
 
 static reloc_howto_type r_imm8 =
-HOWTO (R_IMM8, 0, 1, 8, false, 0,
-       complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff,
-       false);
+HOWTO (R_IMM8, 0, 0, 8, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_imm8", TRUE, 0x000000ff, 0x000000ff,
+       FALSE);
+
+static reloc_howto_type r_rel16 =
+HOWTO (R_REL16, 0, 1, 16, FALSE, 0,
+       complain_overflow_bitfield, 0, "r_rel16", TRUE, 0x0000ffff, 0x0000ffff,
+       TRUE);
 
 static reloc_howto_type r_jr =
-HOWTO (R_JR, 0, 1, 8, true, 0, complain_overflow_signed, 0,
-       "r_jr", true, 0, 0, true);
+HOWTO (R_JR, 0, 0, 8, TRUE, 0, complain_overflow_signed, 0,
+       "r_jr", TRUE, 0, 0, TRUE);
+
+static reloc_howto_type r_disp7 =
+HOWTO (R_DISP7, 0, 0, 7, TRUE, 0, complain_overflow_bitfield, 0,
+       "r_disp7", TRUE, 0, 0, TRUE);
+
+static reloc_howto_type r_callr =
+HOWTO (R_CALLR, 0, 1, 12, TRUE, 0, complain_overflow_signed, 0,
+       "r_callr", TRUE, 0xfff, 0xfff, TRUE);
 
 /* Turn a howto into a reloc number */
@@ -69 +87 @@
 #define __A_MAGIC_SET__
 
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
+/* Code to swap in the reloc.  */
+#define SWAP_IN_RELOC_OFFSET    H_GET_32
+#define SWAP_OUT_RELOC_OFFSET   H_PUT_32
 #define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
   dst->r_stuff[0] = 'S'; \
   dst->r_stuff[1] = 'C';
 
-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
+/* Code to turn a r_type into a howto ptr, uses the above howto table.  */
 
 static void
@@ -98 +115 @@
       internal->howto = &r_jr;
       break;
+    case R_DISP7:
+      internal->howto = &r_disp7;
+      break;
+    case R_CALLR:
+      internal->howto = &r_callr;
+      break;
+    case R_REL16:
+      internal->howto = &r_rel16;
+      break;
     case R_IMM32:
       internal->howto = &r_imm32;
@@ -107 +133 @@
 }
 
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-/* Perform any necessary magic to the addend in a reloc entry */
+#define RTYPE2HOWTO(internal, relocentry) rtype2howto (internal, relocentry)
+
+/* Perform any necessary magic to the addend in a reloc entry.  */
 
 #define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
@@ -120 +146 @@
 reloc_processing (relent, reloc, symbols, abfd, section)
      arelent * relent;
-     struct internal_reloc *reloc;
+     struct internal_reloc * reloc;
      asymbol ** symbols;
      bfd * abfd;
@@ -129 +155 @@
 
   if (reloc->r_symndx > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
+    relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
   else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
+    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
 
   relent->addend = reloc->r_offset;
@@ -143 +165 @@
 static void
 extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
-     bfd *in_abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
+     bfd * in_abfd;
+     struct bfd_link_info * link_info;
+     struct bfd_link_order * link_order;
+     arelent * reloc;
+     bfd_byte * data;
+     unsigned int * src_ptr;
+     unsigned int * dst_ptr;
 {
-  asection *input_section = link_order->u.indirect.section;
+  asection * input_section = link_order->u.indirect.section;
 
   switch (reloc->howto->type)
@@ -164 +186 @@
 
     case R_IMM32:
-      bfd_put_32 (in_abfd,
-                  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-                  data + *dst_ptr);
+      /* If no flags are set, assume immediate value.  */
+      if (! (*reloc->sym_ptr_ptr)->section->flags)
+        {
+          bfd_put_32 (in_abfd,
+                      bfd_coff_reloc16_get_value (reloc, link_info,
+                                                  input_section),
+                      data + *dst_ptr);
+        }
+      else
+        {
+          bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+                                                    input_section);
+          /* Adresses are 23 bit, and the layout of those in a 32-bit
+             value is as follows:
+               1AAAAAAA xxxxxxxx AAAAAAAA AAAAAAAA
+             (A - address bits,  x - ignore).  */
+          dst = (dst & 0xffff) | ((dst & 0xff0000) << 8) | 0x80000000;
+          bfd_put_32 (in_abfd, dst, data + *dst_ptr);
+        }
       (*dst_ptr) += 4;
       (*src_ptr) += 4;
@@ -197 +235 @@
                        + *dst_ptr
                        + input_section->output_section->vma);
-        int gap = dst - dot - 1;/* -1 since were in the odd byte of the
-                                    word and the pc's been incremented */
+        int gap = dst - dot - 1;  /* -1, since we're in the odd byte of the
+                                     word and the pc's been incremented.  */
 
         if (gap & 1)
@@ -216 +254 @@
         break;
       }
+
+    case R_DISP7:
+      {
+        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+                                                  input_section);
+        bfd_vma dot = (link_order->offset
+                       + *dst_ptr
+                       + input_section->output_section->vma);
+        int gap = dst - dot - 1;  /* -1, since we're in the odd byte of the
+                                     word and the pc's been incremented.  */
+
+        if (gap & 1)
+          abort ();
+        gap /= 2;
+
+        if (gap > 0 || gap < -128)
+          {
+            if (! ((*link_info->callbacks->reloc_overflow)
+                   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                    reloc->howto->name, reloc->addend, input_section->owner,
+                    input_section, reloc->address)))
+              abort ();
+          }
+        bfd_put_8 (in_abfd,
+                   (bfd_get_8 ( in_abfd, data + *dst_ptr) & 0x80) + (-gap & 0x7f),
+                   data + *dst_ptr);
+        (*dst_ptr)++;
+        (*src_ptr)++;
+        break;
+      }
+
+    case R_CALLR:
+      {
+        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+                                                  input_section);
+        bfd_vma dot = (link_order->offset
+                       + *dst_ptr
+                       + input_section->output_section->vma);
+        int gap = dst - dot - 2;
+
+        if (gap & 1)
+          abort ();
+        gap /= 2;
+        if (gap > 8191 || gap < -8192)
+          {
+            if (! ((*link_info->callbacks->reloc_overflow)
+                   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                    reloc->howto->name, reloc->addend, input_section->owner,
+                    input_section, reloc->address)))
+              abort ();
+          }
+        bfd_put_16 (in_abfd,
+                    (bfd_get_16 ( in_abfd, data + *dst_ptr) & 0xf000) | (-gap & 0x0fff),
+                    data + *dst_ptr);
+        (*dst_ptr) += 2;
+        (*src_ptr) += 2;
+        break;
+      }
+
+    case R_REL16:
+      {
+        bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
+                                                  input_section);
+        bfd_vma dot = (link_order->offset
+                       + *dst_ptr
+                       + input_section->output_section->vma);
+        int gap = dst - dot - 2;
+
+        if (gap > 32767 || gap < -32768)
+          {
+            if (! ((*link_info->callbacks->reloc_overflow)
+                   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+                    reloc->howto->name, reloc->addend, input_section->owner,
+                    input_section, reloc->address)))
+              abort ();
+          }
+        bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
+        (*dst_ptr) += 2;
+        (*src_ptr) += 2;
+        break;
+      }
+
     default:
       abort ();