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

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

@@ -1 +1 @@
 /* BFD back-end for Intel 960 COFF files.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000
-   Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001,
+   2002 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -30 +30 @@
 #include "libcoff.h"            /* to allow easier abstraction-breaking */
 
-static boolean coff_i960_is_local_label_name PARAMS ((bfd *, const char *));
+static bfd_boolean coff_i960_is_local_label_name
+  PARAMS ((bfd *, const char *));
 static bfd_reloc_status_type optcall_callback
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
@@ -37 +38 @@
 static reloc_howto_type *coff_i960_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean coff_i960_start_final_link
+static bfd_boolean coff_i960_start_final_link
   PARAMS ((bfd *, struct bfd_link_info *));
-static boolean coff_i960_relocate_section
+static bfd_boolean coff_i960_relocate_section
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
            struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_i960_adjust_symndx
+static bfd_boolean coff_i960_adjust_symndx
   PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-           struct internal_reloc *, boolean *));
+           struct internal_reloc *, bfd_boolean *));
 
 #define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
 #define COFF_ALIGN_IN_SECTION_HEADER 1
 
-#define GET_SCNHDR_ALIGN bfd_h_get_32
-#define PUT_SCNHDR_ALIGN bfd_h_put_32
+#define GET_SCNHDR_ALIGN H_GET_32
+#define PUT_SCNHDR_ALIGN H_PUT_32
 
 /* The i960 does not support an MMU, so COFF_PAGE_SIZE can be
@@ -60 +61 @@
 /* This set of local label names is taken from gas.  */
 
-static boolean
+static bfd_boolean
 coff_i960_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -157 +158 @@
              is the offset of the bal entry point.  */
           word = ((word +  olf)  & BAL_MASK) | BAL;
-          bfd_put_32 (abfd, word, (bfd_byte *) data + reloc_entry->address);
+          bfd_put_32 (abfd, (bfd_vma) word,
+                      (bfd_byte *) data + reloc_entry->address);
         }
         result = bfd_reloc_ok;
@@ -252 +254 @@
       if (coff_section_data (output_bfd, osec) == NULL)
         {
-          osec->used_by_bfd =
-            ((PTR) bfd_zalloc (abfd,
-                               sizeof (struct coff_section_tdata)));
+          bfd_size_type amt = sizeof (struct coff_section_tdata);
+          osec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
           if (osec->used_by_bfd == NULL)
             return bfd_reloc_overflow;
@@ -267 +268 @@
 
 static reloc_howto_type howto_rellong =
-  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,false, 0,
-         complain_overflow_bitfield, coff_i960_relocate,"rellong", true,
+  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,FALSE, 0,
+         complain_overflow_bitfield, coff_i960_relocate,"rellong", TRUE,
          0xffffffff, 0xffffffff, 0);
 static reloc_howto_type howto_iprmed =
-  HOWTO (R_IPRMED, 0, 2, 24,true,0, complain_overflow_signed,
-         coff_i960_relocate, "iprmed ", true, 0x00ffffff, 0x00ffffff, 0);
+  HOWTO (R_IPRMED, 0, 2, 24,TRUE,0, complain_overflow_signed,
+         coff_i960_relocate, "iprmed ", TRUE, 0x00ffffff, 0x00ffffff, 0);
 static reloc_howto_type howto_optcall =
-  HOWTO (R_OPTCALL, 0,2,24,true,0, complain_overflow_signed,
-         optcall_callback, "optcall", true, 0x00ffffff, 0x00ffffff, 0);
+  HOWTO (R_OPTCALL, 0,2,24,TRUE,0, complain_overflow_signed,
+         optcall_callback, "optcall", TRUE, 0x00ffffff, 0x00ffffff, 0);
 
 static reloc_howto_type *
@@ -319 +320 @@
    necessary symbols.  */
 
-static boolean
+static bfd_boolean
 coff_i960_start_final_link (abfd, info)
      bfd *abfd;
@@ -329 +330 @@
 
   if (! info->relocateable)
-    return true;
+    return TRUE;
 
   esym = (bfd_byte *) bfd_malloc (symesz);
   if (esym == NULL)
-    return false;
+    return FALSE;
 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   for (o = abfd->sections; o != NULL; o = o->next)
@@ -351 +352 @@
       bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
 
-      if (bfd_write (esym, symesz, 1, abfd) != symesz)
+      if (bfd_bwrite (esym, symesz, abfd) != symesz)
         {
           free (esym);
-          return false;
+          return FALSE;
         }
 
@@ -362 +363 @@
   free (esym);
 
-  return true;
+  return TRUE;
 }
 
 /* The reloc processing routine for the optimized COFF linker.  */
 
-static boolean
+static bfd_boolean
 coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
                             contents, relocs, syms, sections)
@@ -393 +394 @@
       reloc_howto_type *howto;
       bfd_reloc_status_type rstat = bfd_reloc_ok;
-      boolean done;
+      bfd_boolean done;
 
       symndx = rel->r_symndx;
@@ -420 +421 @@
         default:
           bfd_set_error (bfd_error_bad_value);
-          return false;
+          return FALSE;
         }
 
@@ -459 +460 @@
               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;
             }
         }
 
-      done = false;
+      done = FALSE;
 
       if (howto->type == R_OPTCALL && ! info->relocateable && symndx != -1)
@@ -486 +487 @@
                       input_bfd, input_section,
                       rel->r_vaddr - input_section->vma)))
-                return false;
+                return FALSE;
               break;
             case C_LEAFSTAT:
@@ -520 +521 @@
                 word = ((word + olf - val) & BAL_MASK) | BAL;
                 bfd_put_32 (input_bfd,
-                            word,
-                            (contents
-                             + (rel->r_vaddr - input_section->vma)));
-                done = true;
+                            (bfd_vma) word,
+                            contents + (rel->r_vaddr - input_section->vma));
+                done = TRUE;
               }
               break;
@@ -561 +561 @@
                 name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
                 if (name == NULL)
-                  return false;
+                  return FALSE;
               }
 
@@ -567 +567 @@
                    (info, name, howto->name, (bfd_vma) 0, input_bfd,
                     input_section, rel->r_vaddr - input_section->vma)))
-              return false;
+              return FALSE;
           }
         }
     }
 
-  return true;
+  return TRUE;
 }
 
@@ -579 +579 @@
    for the section.  */
 
-static boolean
+static bfd_boolean
 coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
      bfd *obfd ATTRIBUTE_UNUSED;
@@ -586 +586 @@
      asection *sec ATTRIBUTE_UNUSED;
      struct internal_reloc *irel;
-     boolean *adjustedp;
+     bfd_boolean *adjustedp;
 {
   struct coff_link_hash_entry *h;
 
-  *adjustedp = false;
+  *adjustedp = FALSE;
 
   h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
@@ -596 +596 @@
       || (h->root.type != bfd_link_hash_defined
           && h->root.type != bfd_link_hash_defweak))
-    return true;
+    return TRUE;
 
   irel->r_symndx = h->root.u.def.section->output_section->target_index - 1;
-  *adjustedp = true;
-
-  return true;
+  *adjustedp = TRUE;
+
+  return TRUE;
 }