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

branches/GNU/src/binutils/bfd/reloc16.c

@@ -1 +1 @@
 /* 8 and 16 bit COFF relocation functions, for BFD.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001,
+   2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -30 +30 @@
    where coff_link_input_bfd can find them (and coff_link_input_bfd
    should be changed to use this location rather than rereading the
-   file) (unless info->keep_memory is false, in which case they should
+   file) (unless info->keep_memory is FALSE, in which case they should
    free up the relocs after dealing with them).  */
 
@@ -65 +65 @@
       h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
                                         bfd_asymbol_name (symbol),
-                                        false, false, true);
+                                        FALSE, FALSE, TRUE);
       if (h != (struct bfd_link_hash_entry *) NULL
           && (h->type == bfd_link_hash_defined
@@ -80 +80 @@
                 (link_info, bfd_asymbol_name (symbol),
                  input_section->owner, input_section, reloc->address,
-                 true)))
+                 TRUE)))
             abort ();
           value = 0;
@@ -137 +137 @@
 }
 
-boolean
-bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
+bfd_boolean
+bfd_coff_reloc16_relax_section (abfd, input_section, link_info, again)
      bfd *abfd;
-     asection *i;
+     asection *input_section;
      struct bfd_link_info *link_info;
-     boolean *again;
+     bfd_boolean *again;
 {
   /* Get enough memory to hold the stuff.  */
-  bfd *input_bfd = i->owner;
-  asection *input_section = i;
-  int *shrinks;
-  int shrink = 0;
+  bfd *input_bfd = input_section->owner;
+  unsigned *shrinks;
+  unsigned shrink = 0;
   long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
   arelent **reloc_vector = NULL;
@@ -155 +154 @@
   /* We only do global relaxation once.  It is not safe to do it multiple
      times (see discussion of the "shrinks" array below).  */
-  *again = false;
+  *again = FALSE;
 
   if (reloc_size < 0)
-    return false;
-
-  reloc_vector = (arelent **) bfd_malloc (reloc_size);
+    return FALSE;
+
+  reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
   if (!reloc_vector && reloc_size > 0)
-    return false;
+    return FALSE;
 
   /* Get the relocs and think about them.  */
@@ -171 +170 @@
     {
       free (reloc_vector);
-      return false;
+      return FALSE;
     }
 
@@ -192 +191 @@
     {
       int another_pass = 0;
+      bfd_size_type amt;
 
       /* Allocate and initialize the shrinks array for this section.
-         The last element is used as an accumlator of shrinks.  */
-      shrinks = (int *) bfd_malloc ((reloc_count + 1) * sizeof (int));
-      memset (shrinks, 0, (reloc_count + 1) * sizeof (int));
+         The last element is used as an accumlator of shrinks.  */
+      amt = reloc_count + 1;
+      amt *= sizeof (unsigned);
+      shrinks = (unsigned *) bfd_zmalloc (amt);
 
       /* Loop until nothing changes in this section.  */
-      do {
-        arelent **parent;
-        unsigned int i;
-        long j;
-
-        another_pass = 0;
-
-        for (i = 0, parent = reloc_vector; *parent; parent++, i++)
-          {
-            /* Let the target/machine dependent code examine each reloc
-               in this section and attempt to shrink it.  */
-            shrink = bfd_coff_reloc16_estimate (abfd, input_section, *parent,
-                                                shrinks[i], link_info);
-
-            /* If it shrunk, note it in the shrinks array and set up for
-               another pass.  */
-            if (shrink != shrinks[i])
-              {
-                another_pass = 1;
-                for (j = i + 1; j <= reloc_count; j++)
-                  shrinks[j] += shrink - shrinks[i];
-              }
-          }
-      }
+      do
+        {
+          arelent **parent;
+          unsigned int i;
+          long j;
+
+          another_pass = 0;
+
+          for (i = 0, parent = reloc_vector; *parent; parent++, i++)
+            {
+              /* Let the target/machine dependent code examine each reloc
+                 in this section and attempt to shrink it.  */
+              shrink = bfd_coff_reloc16_estimate (abfd, input_section, *parent,
+                                                  shrinks[i], link_info);
+
+              /* If it shrunk, note it in the shrinks array and set up for
+                 another pass.  */
+              if (shrink != shrinks[i])
+                {
+                  another_pass = 1;
+                  for (j = i + 1; j <= reloc_count; j++)
+                    shrinks[j] += shrink - shrinks[i];
+                }
+            }
+        }
       while (another_pass);
 
@@ -231 +233 @@
   input_section->_cooked_size -= shrink;
   free ((char *) reloc_vector);
-  return true;
+  return TRUE;
 }
 
 bfd_byte *
-bfd_coff_reloc16_get_relocated_section_contents(in_abfd,
-                                                link_info,
-                                                link_order,
-                                                data,
-                                                relocateable,
-                                                symbols)
+bfd_coff_reloc16_get_relocated_section_contents (in_abfd,
+                                                 link_info,
+                                                 link_order,
+                                                 data,
+                                                 relocateable,
+                                                 symbols)
      bfd *in_abfd;
      struct bfd_link_info *link_info;
      struct bfd_link_order *link_order;
      bfd_byte *data;
-     boolean relocateable;
+     bfd_boolean relocateable;
      asymbol **symbols;
 {
@@ -266 +268 @@
 
   /* Read in the section.  */
-  if (!bfd_get_section_contents(input_bfd,
-                                input_section,
-                                data,
-                                0,
-                                input_section->_raw_size))
+  if (!bfd_get_section_contents (input_bfd,
+                                 input_section,
+                                 data,
+                                 (bfd_vma) 0,
+                                 input_section->_raw_size))
     return NULL;
 
-  reloc_vector = (arelent **) bfd_malloc ((size_t) reloc_size);
+  reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
   if (!reloc_vector && reloc_size != 0)
     return NULL;