Changeset 609 for branches/GNU/src/binutils/bfd/coff-a29k.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-a29k.c (modified) (34 diffs, 1 prop)

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

@@ -1 +1 @@
 /* BFD back-end for AMD 29000 COFF binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
    Contributed by David Wood at New York University 7/8/91.
@@ -32 +32 @@
 static bfd_reloc_status_type a29k_reloc
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_a29k_relocate_section
+static bfd_boolean coff_a29k_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
            struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_a29k_adjust_symndx
+static bfd_boolean coff_a29k_adjust_symndx
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-           struct internal_reloc *, boolean *));
+           struct internal_reloc *, bfd_boolean *));
+static void reloc_processing
+  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
@@ -48 +50 @@
     (((HWORD) ^ 0x8000) - 0x8000)
 
-/* Provided the symbol, returns the value reffed */
+/* Provided the symbol, returns the value reffed.  */
+
 static long
 get_symbol_value (symbol)
@@ -56 +59 @@
 
   if (bfd_is_com_section (symbol->section))
-    {
-      relocation = 0;
-    }
+    relocation = 0;
   else
-    {
-      relocation = symbol->value +
-        symbol->section->output_section->vma +
-        symbol->section->output_offset;
-    }
-
-  return(relocation);
+    relocation = symbol->value +
+      symbol->section->output_section->vma +
+      symbol->section->output_offset;
+
+  return relocation;
 }
 
-/* this function is in charge of performing all the 29k relocations */
+/* This function is in charge of performing all the 29k relocations.  */
 
 static bfd_reloc_status_type
@@ -82 +81 @@
      char **error_message;
 {
-  /* the consth relocation comes in two parts, we have to remember
-     the state between calls, in these variables */
-  static boolean part1_consth_active = false;
+  /* The consth relocation comes in two parts, we have to remember
+     the state between calls, in these variables.  */
+  static bfd_boolean part1_consth_active = FALSE;
   static unsigned long part1_consth_value;
-
   unsigned long insn;
   unsigned long sym_value;
@@ -92 +90 @@
   unsigned short r_type;
   long signed_value;
-
   unsigned long addr = reloc_entry->address ; /*+ input_section->vma*/
   bfd_byte  *hit_data =addr + (bfd_byte *) (data);
@@ -100 +97 @@
   if (output_bfd)
     {
-      /* Partial linking - do nothing */
+      /* Partial linking - do nothing.  */
       reloc_entry->address += input_section->output_offset;
       return bfd_reloc_ok;
-
     }
 
@@ -109 +105 @@
       && bfd_is_und_section (symbol_in->section))
     {
-      /* Keep the state machine happy in case we're called again */
+      /* Keep the state machine happy in case we're called again.  */
       if (r_type == R_IHIHALF)
         {
-          part1_consth_active = true;
+          part1_consth_active = TRUE;
           part1_consth_value  = 0;
         }
-      return(bfd_reloc_undefined);
+      return bfd_reloc_undefined;
     }
 
   if ((part1_consth_active) && (r_type != R_IHCONST))
     {
-      part1_consth_active = false;
+      part1_consth_active = FALSE;
       *error_message = (char *) _("Missing IHCONST");
-      return(bfd_reloc_dangerous);
+
+      return bfd_reloc_dangerous;
     }
 
@@ -131 +128 @@
     case R_IREL:
       insn = bfd_get_32 (abfd, hit_data);
-      /* Take the value in the field and sign extend it */
+      /* Take the value in the field and sign extend it.  */
       signed_value = EXTRACT_HWORD(insn);
       signed_value = SIGN_EXTEND_HWORD(signed_value);
@@ -143 +140 @@
       if ((signed_value & ~0x3ffff) == 0)
         {                               /* Absolute jmp/call */
-          insn |= (1<<24);              /* Make it absolute */
-          /* FIXME: Should we change r_type to R_IABS */
+          insn |= (1 << 24);            /* Make it absolute */
+          /* FIXME: Should we change r_type to R_IABS.  */
         }
       else
         {
           /* Relative jmp/call, so subtract from the value the
-             address of the place we're coming from */
+             address of the place we're coming from.  */
           signed_value -= (reloc_entry->address
                            + input_section->output_section->vma
                            + input_section->output_offset);
-          if (signed_value>0x1ffff || signed_value<-0x20000)
-            return(bfd_reloc_overflow);
+          if (signed_value > 0x1ffff || signed_value < -0x20000)
+            return bfd_reloc_overflow;
         }
       signed_value >>= 2;
-      insn = INSERT_HWORD(insn, signed_value);
-      bfd_put_32 (abfd, insn ,hit_data);
+      insn = INSERT_HWORD (insn, signed_value);
+      bfd_put_32 (abfd, (bfd_vma) insn ,hit_data);
       break;
     case R_ILOHALF:
@@ -165 +162 @@
       unsigned_value +=  sym_value + reloc_entry->addend;
       insn = INSERT_HWORD(insn, unsigned_value);
-      bfd_put_32 (abfd, insn, hit_data);
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
       break;
     case R_IHIHALF:
       insn = bfd_get_32 (abfd, hit_data);
       /* consth, part 1
-         Just get the symbol value that is referenced */
-      part1_consth_active = true;
+         Just get the symbol value that is referenced.  */
+      part1_consth_active = TRUE;
       part1_consth_value = sym_value + reloc_entry->addend;
-      /* Don't modify insn until R_IHCONST */
+      /* Don't modify insn until R_IHCONST.  */
       break;
     case R_IHCONST:
       insn = bfd_get_32 (abfd, hit_data);
       /* consth, part 2
-         Now relocate the reference */
-      if (part1_consth_active == false)
+         Now relocate the reference.  */
+      if (! part1_consth_active)
         {
           *error_message = (char *) _("Missing IHIHALF");
-          return(bfd_reloc_dangerous);
+          return bfd_reloc_dangerous;
         }
       /* sym_ptr_ptr = r_symndx, in coff_slurp_reloc_table() */
@@ -190 +187 @@
       unsigned_value = unsigned_value >> 16;
       insn = INSERT_HWORD(insn, unsigned_value);
-      part1_consth_active = false;
-      bfd_put_32 (abfd, insn, hit_data);
+      part1_consth_active = FALSE;
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
       break;
     case R_BYTE:
@@ -197 +194 @@
       unsigned_value = insn + sym_value + reloc_entry->addend;
       if (unsigned_value & 0xffffff00)
-        return(bfd_reloc_overflow);
+        return bfd_reloc_overflow;
       bfd_put_8 (abfd, unsigned_value, hit_data);
       break;
@@ -204 +201 @@
       unsigned_value = insn + sym_value + reloc_entry->addend;
       if (unsigned_value & 0xffff0000)
-        return(bfd_reloc_overflow);
-      bfd_put_16 (abfd, insn, hit_data);
+        return bfd_reloc_overflow;
+      bfd_put_16 (abfd, (bfd_vma) insn, hit_data);
       break;
     case R_WORD:
       insn = bfd_get_32 (abfd, hit_data);
       insn += sym_value + reloc_entry->addend;
-      bfd_put_32 (abfd, insn, hit_data);
+      bfd_put_32 (abfd, (bfd_vma) insn, hit_data);
       break;
     default:
       *error_message = _("Unrecognized reloc");
-      return (bfd_reloc_dangerous);
+      return bfd_reloc_dangerous;
     }
 
@@ -220 +217 @@
 }
 
-/*      type       rightshift
-                       size
-                          bitsize
-                               pc-relative
-                                     bitpos
-                                         absolute
-                                             complain_on_overflow
-                                                  special_function
-                                                    relocation name
-                                                               partial_inplace
-                                                                      src_mask
-*/
-
-/*FIXME: I'm not real sure about this table */
+/*FIXME: I'm not real sure about this table.  */
 static reloc_howto_type howto_table[] =
-{
-  {R_ABS,     0, 3, 32, false, 0, complain_overflow_bitfield,a29k_reloc,"ABS",     true, 0xffffffff,0xffffffff, false},
-  EMPTY_HOWTO (1),
-  EMPTY_HOWTO (2),
-  EMPTY_HOWTO (3),
-  EMPTY_HOWTO (4),
-  EMPTY_HOWTO (5),
-  EMPTY_HOWTO (6),
-  EMPTY_HOWTO (7),
-  EMPTY_HOWTO (8),
-  EMPTY_HOWTO (9),
-  EMPTY_HOWTO (10),
-  EMPTY_HOWTO (11),
-  EMPTY_HOWTO (12),
-  EMPTY_HOWTO (13),
-  EMPTY_HOWTO (14),
-  EMPTY_HOWTO (15),
-  EMPTY_HOWTO (16),
-  EMPTY_HOWTO (17),
-  EMPTY_HOWTO (18),
-  EMPTY_HOWTO (19),
-  EMPTY_HOWTO (20),
-  EMPTY_HOWTO (21),
-  EMPTY_HOWTO (22),
-  EMPTY_HOWTO (23),
-  {R_IREL,    0, 3, 32, true,  0, complain_overflow_signed,a29k_reloc,"IREL",    true, 0xffffffff,0xffffffff, false},
-  {R_IABS,    0, 3, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"IABS",    true, 0xffffffff,0xffffffff, false},
-  {R_ILOHALF, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"ILOHALF", true, 0x0000ffff,0x0000ffff, false},
-  {R_IHIHALF, 0, 3, 16, true,  16, complain_overflow_signed, a29k_reloc,"IHIHALF", true, 0xffff0000,0xffff0000, false},
-  {R_IHCONST, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"IHCONST", true, 0xffff0000,0xffff0000, false},
-  {R_BYTE,    0, 0, 8, false, 0, complain_overflow_bitfield, a29k_reloc,"BYTE",    true, 0x000000ff,0x000000ff, false},
-  {R_HWORD,   0, 1, 16, false, 0, complain_overflow_bitfield, a29k_reloc,"HWORD",   true, 0x0000ffff,0x0000ffff, false},
-  {R_WORD,    0, 2, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"WORD",    true, 0xffffffff,0xffffffff, false},
-};
+  {
+    {R_ABS,     0, 3, 32, FALSE, 0, complain_overflow_bitfield,a29k_reloc,"ABS",     TRUE, 0xffffffff,0xffffffff, FALSE},
+    EMPTY_HOWTO (1),
+    EMPTY_HOWTO (2),
+    EMPTY_HOWTO (3),
+    EMPTY_HOWTO (4),
+    EMPTY_HOWTO (5),
+    EMPTY_HOWTO (6),
+    EMPTY_HOWTO (7),
+    EMPTY_HOWTO (8),
+    EMPTY_HOWTO (9),
+    EMPTY_HOWTO (10),
+    EMPTY_HOWTO (11),
+    EMPTY_HOWTO (12),
+    EMPTY_HOWTO (13),
+    EMPTY_HOWTO (14),
+    EMPTY_HOWTO (15),
+    EMPTY_HOWTO (16),
+    EMPTY_HOWTO (17),
+    EMPTY_HOWTO (18),
+    EMPTY_HOWTO (19),
+    EMPTY_HOWTO (20),
+    EMPTY_HOWTO (21),
+    EMPTY_HOWTO (22),
+    EMPTY_HOWTO (23),
+    {R_IREL,    0, 3, 32, TRUE,  0, complain_overflow_signed,a29k_reloc,"IREL",    TRUE, 0xffffffff,0xffffffff, FALSE},
+    {R_IABS,    0, 3, 32, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"IABS",    TRUE, 0xffffffff,0xffffffff, FALSE},
+    {R_ILOHALF, 0, 3, 16, TRUE,  0, complain_overflow_signed, a29k_reloc,"ILOHALF", TRUE, 0x0000ffff,0x0000ffff, FALSE},
+    {R_IHIHALF, 0, 3, 16, TRUE,  16, complain_overflow_signed, a29k_reloc,"IHIHALF", TRUE, 0xffff0000,0xffff0000, FALSE},
+    {R_IHCONST, 0, 3, 16, TRUE,  0, complain_overflow_signed, a29k_reloc,"IHCONST", TRUE, 0xffff0000,0xffff0000, FALSE},
+    {R_BYTE,    0, 0, 8, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"BYTE",    TRUE, 0x000000ff,0x000000ff, FALSE},
+    {R_HWORD,   0, 1, 16, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"HWORD",   TRUE, 0x0000ffff,0x0000ffff, FALSE},
+    {R_WORD,    0, 2, 32, FALSE, 0, complain_overflow_bitfield, a29k_reloc,"WORD",    TRUE, 0xffffffff,0xffffffff, FALSE},
+  };
 
 #define BADMAG(x) A29KBADMAG(x)
@@ -305 +289 @@
     {
       asymbol *ptr;
-      relent->sym_ptr_ptr = symbols + obj_convert(abfd)[reloc->r_symndx];
+
+      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
 
       ptr = *(relent->sym_ptr_ptr);
@@ -311 +296 @@
       if (ptr
           && bfd_asymbol_bfd(ptr) == abfd
-
-          && ((ptr->flags & BSF_OLD_COMMON)== 0))
-        {
-          relent->addend = 0;
-        }
+          && ((ptr->flags & BSF_OLD_COMMON) == 0))
+        relent->addend = 0;
       else
-        {
-          relent->addend = 0;
-        }
+        relent->addend = 0;
+
       relent->address-= section->vma;
       if (reloc->r_type == R_IHIHALF)
@@ -330 +311 @@
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
                             contents, relocs, syms, sections)
@@ -344 +325 @@
   struct internal_reloc *rel;
   struct internal_reloc *relend;
-  boolean hihalf;
+  bfd_boolean hihalf;
   bfd_vma hihalf_val;
 
@@ -351 +332 @@
      addresses and symbol indices.  */
   if (info->relocateable)
-    return true;
-
-  hihalf = false;
+    return TRUE;
+
+  hihalf = FALSE;
   hihalf_val = 0;
 
@@ -366 +347 @@
       asection *sec;
       bfd_vma val;
-      boolean overflow;
+      bfd_boolean overflow;
       unsigned long insn;
       long signed_value;
@@ -405 +386 @@
           else
             {
-              if (h->root.type == bfd_link_hash_defined
+              if (   h->root.type == bfd_link_hash_defined
                   || h->root.type == bfd_link_hash_defweak)
                 {
@@ -417 +398 @@
                   if (! ((*info->callbacks->undefined_symbol)
                          (info, h->root.root.string, input_bfd, input_section,
-                          rel->r_vaddr - input_section->vma, true)))
-                    return false;
+                          rel->r_vaddr - input_section->vma, TRUE)))
+                    return FALSE;
                 }
             }
@@ -427 +408 @@
                      (info, _("missing IHCONST reloc"), input_bfd,
                       input_section, rel->r_vaddr - input_section->vma)))
-                return false;
-              hihalf = false;
-            }
-        }
-
-      overflow = false;
+                return FALSE;
+              hihalf = FALSE;
+            }
+        }
+
+      overflow = FALSE;
 
       switch (rel->r_type)
@@ -438 +419 @@
         default:
           bfd_set_error (bfd_error_bad_value);
-          return false;
+          return FALSE;
 
         case R_IREL:
@@ -485 +466 @@
               if (signed_value > 0x1ffff || signed_value < - 0x20000)
                 {
-                  overflow = true;
+                  overflow = TRUE;
                   signed_value = 0;
                 }
@@ -495 +476 @@
 
           bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
-
           break;
 
@@ -503 +483 @@
           unsigned_value += val;
           insn = INSERT_HWORD (insn, unsigned_value);
-          bfd_put_32 (input_bfd, insn, loc);
+          bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
           break;
 
         case R_IHIHALF:
           /* Save the value for the R_IHCONST reloc.  */
-          hihalf = true;
+          hihalf = TRUE;
           hihalf_val = val;
           break;
@@ -518 +498 @@
                      (info, _("missing IHIHALF reloc"), input_bfd,
                       input_section, rel->r_vaddr - input_section->vma)))
-                return false;
+                return FALSE;
               hihalf_val = 0;
             }
@@ -528 +508 @@
           bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
 
-          hihalf = false;
+          hihalf = FALSE;
 
           break;
@@ -538 +518 @@
                                           input_bfd, val, loc);
           if (rstat == bfd_reloc_overflow)
-            overflow = true;
+            overflow = TRUE;
           else if (rstat != bfd_reloc_ok)
             abort ();
@@ -569 +549 @@
                   input_bfd, input_section,
                   rel->r_vaddr - input_section->vma)))
-            return false;
-        }
-    }
-
-  return true;
+            return FALSE;
+        }
+    }
+
+  return TRUE;
 }
 
@@ -581 +561 @@
    is actually an addend, not a symbol index at all.  */
 
-static boolean
+static bfd_boolean
 coff_a29k_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
@@ -588 +568 @@
      asection *sec ATTRIBUTE_UNUSED;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   if (irel->r_type == R_IHCONST)
-    *adjustedp = true;
+    *adjustedp = TRUE;
   else
-    *adjustedp = false;
-  return true;
+    *adjustedp = FALSE;
+  return TRUE;
 }