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

branches/GNU/src/binutils/bfd/nlm32-i386.c

@@ -1 +1 @@
 /* Support for 32-bit i386 NLM (NetWare Loadable Module)
-   Copyright 1993, 1994, 2000 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -29 +29 @@
 #include "libnlm.h"
 
-static boolean nlm_i386_read_reloc
+static bfd_boolean nlm_i386_read_reloc
   PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_i386_write_import
+static bfd_boolean nlm_i386_write_import
   PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_i386_mangle_relocs
+static bfd_boolean nlm_i386_mangle_relocs
   PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_i386_read_import
+static bfd_boolean nlm_i386_read_import
   PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_i386_write_external
+static bfd_boolean nlm_i386_write_external
   PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
 
@@ -47 +47 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         false,                 /* pc_relative */
+         FALSE,                 /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_bitfield, /* complain_on_overflow */
          0,                     /* special_function */
          "32",                  /* name */
-         true,                  /* partial_inplace */
+         TRUE,                  /* partial_inplace */
          0xffffffff,            /* src_mask */
          0xffffffff,            /* dst_mask */
-         false);                /* pcrel_offset */
+         FALSE);                /* pcrel_offset */
 
 /* Adjust the reloc location by a PC relative displacement.  */
@@ -64 +64 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long) */
          32,                    /* bitsize */
-         true,                  /* pc_relative */
+         TRUE,                  /* pc_relative */
          0,                     /* bitpos */
          complain_overflow_signed, /* complain_on_overflow */
          0,                     /* special_function */
          "DISP32",              /* name */
-         true,                  /* partial_inplace */
+         TRUE,                  /* partial_inplace */
          0xffffffff,            /* src_mask */
          0xffffffff,            /* dst_mask */
-         true);                 /* pcrel_offset */
+         TRUE);                 /* pcrel_offset */
 
 /* Read a NetWare i386 reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_read_reloc (abfd, sym, secp, rel)
      bfd *abfd;
@@ -87 +87 @@
   const char *name;
 
-  if (bfd_read (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
+  if (bfd_bread (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
 
   val = bfd_get_32 (abfd, temp);
@@ -146 +146 @@
   rel->addend = 0;
 
-  return true;
+  return TRUE;
 }
 
 /* Write a NetWare i386 reloc.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_write_import (abfd, sec, rel)
      bfd *abfd;
@@ -175 +175 @@
     {
       bfd_set_error (bfd_error_invalid_operation);
-      return false;
+      return FALSE;
     }
 
@@ -203 +203 @@
         {
           bfd_set_error (bfd_error_invalid_operation);
-          return false;
+          return FALSE;
         }
 
@@ -223 +223 @@
             {
               bfd_set_error (bfd_error_invalid_operation);
-              return false;
+              return FALSE;
             }
         }
@@ -229 +229 @@
 
   bfd_put_32 (abfd, val, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  return true;
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
+
+  return TRUE;
 }
 
-/* I want to be able to use objcopy to turn a i386 a.out or COFF file
+/* I want to be able to use objcopy to turn an i386 a.out or COFF file
    into a NetWare i386 module.  That means that the relocs from the
    source file have to be mapped into relocs that apply to the target
@@ -244 +244 @@
    general implementation.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_mangle_relocs (abfd, sec, data, offset, count)
      bfd *abfd;
@@ -336 +336 @@
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Read a NetWare i386 import record */
-static boolean
+static bfd_boolean
 nlm_i386_read_import (abfd, sym)
      bfd *abfd;
@@ -351 +351 @@
   char *name;
 
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
+  if (bfd_bread ((PTR) &symlength, (bfd_size_type) sizeof (symlength), abfd)
       != sizeof (symlength))
-    return false;
+    return FALSE;
   sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
+  name = bfd_alloc (abfd, (bfd_size_type) symlength + 1);
   if (name == NULL)
-    return false;
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
-    return false;
+    return FALSE;
+  if (bfd_bread (name, (bfd_size_type) symlength, abfd) != symlength)
+    return FALSE;
   name[symlength] = '\0';
   sym -> symbol.name = name;
@@ -365 +365 @@
   sym -> symbol.value = 0;
   sym -> symbol.section = bfd_und_section_ptr;
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-  rcount = bfd_h_get_32 (abfd, temp);
+  if (bfd_bread ((PTR) temp, (bfd_size_type) sizeof (temp), abfd)
+      != sizeof (temp))
+    return FALSE;
+  rcount = H_GET_32 (abfd, temp);
   nlm_relocs = ((struct nlm_relent *)
                 bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
   if (!nlm_relocs)
-    return false;
+    return FALSE;
   sym -> relocs = nlm_relocs;
   sym -> rcnt = 0;
@@ -378 +379 @@
       asection *section;
 
-      if (nlm_i386_read_reloc (abfd, sym, &section,
-                               &nlm_relocs -> reloc)
-          == false)
-        return false;
+      if (! nlm_i386_read_reloc (abfd, sym, &section, &nlm_relocs -> reloc))
+        return FALSE;
       nlm_relocs -> section = section;
       nlm_relocs++;
       sym -> rcnt++;
     }
-  return true;
+  return TRUE;
 }
 
 /* Write out an external reference.  */
 
-static boolean
+static bfd_boolean
 nlm_i386_write_external (abfd, count, sym, relocs)
      bfd *abfd;
@@ -403 +402 @@
 
   len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof (bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
+  if ((bfd_bwrite (&len, (bfd_size_type) sizeof (bfd_byte), abfd)
+       != sizeof (bfd_byte))
+      || bfd_bwrite (sym->name, (bfd_size_type) len, abfd) != len)
+    return FALSE;
 
   bfd_put_32 (abfd, count, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
+  if (bfd_bwrite (temp, (bfd_size_type) sizeof (temp), abfd) != sizeof (temp))
+    return FALSE;
 
   for (i = 0; i < count; i++)
     {
-      if (nlm_i386_write_import (abfd, relocs[i].sec,
-                                 relocs[i].rel) == false)
-        return false;
-    }
-
-  return true;
+      if (! nlm_i386_write_import (abfd, relocs[i].sec, relocs[i].rel))
+        return FALSE;
+    }
+
+  return TRUE;
 }
 
@@ -430 +429 @@
   bfd_arch_i386,
   0,
-  false,
+  FALSE,
   0,    /* backend_object_p */
   0,    /* write_prefix_func */