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

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

@@ -1 +1 @@
 /* BFD back-end for i386 a.out binaries under LynxOS.
-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 2001, 2002, 2003
    Free Software Foundation, Inc.
 
@@ -19 +19 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define BYTES_IN_WORD 4
 #define N_SHARED_LIB(x) 0
 
@@ -27 +26 @@
 #define DEFAULT_ARCH bfd_arch_i386
 
-#define MY(OP) CAT(i386lynx_aout_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (i386lynx_aout_,OP)
 #define TARGETNAME "a.out-i386-lynx"
 
@@ -51 +53 @@
         NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);           \
                                                                               \
-        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;       \
-        if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)           \
-            != EXEC_BYTES_SIZE)                                               \
-          return false;                                                       \
+        if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0                      \
+            || bfd_bwrite ((PTR) &exec_bytes, (bfd_size_type) EXEC_BYTES_SIZE, \
+                          abfd) != EXEC_BYTES_SIZE)                           \
+          return FALSE;                                                       \
         /* Now write out reloc info, followed by syms and strings */          \
                                                                               \
         if (bfd_get_symcount (abfd) != 0)                                     \
             {                                                                 \
-              if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET)     \
+              if (bfd_seek (abfd, (file_ptr) (N_SYMOFF(*execp)), SEEK_SET)    \
                   != 0)                                                       \
-                return false;                                                 \
+                return FALSE;                                                 \
                                                                               \
-              if (! NAME(aout,write_syms)(abfd)) return false;                \
+              if (! NAME(aout,write_syms) (abfd)) return FALSE;               \
                                                                               \
-              if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET)    \
+              if (bfd_seek (abfd, (file_ptr) (N_TRELOFF(*execp)), SEEK_SET)   \
                   != 0)                                                       \
-                return false;                                                 \
+                return FALSE;                                                 \
                                                                               \
               if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
-                return false;                                                 \
-              if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET)    \
+                return FALSE;                                                 \
+              if (bfd_seek (abfd, (file_ptr) (N_DRELOFF(*execp)), SEEK_SET)   \
                   != 0)                                                       \
                 return 0;                                                     \
                                                                               \
-              if (!NAME(lynx,squirt_out_relocs)(abfd, obj_datasec (abfd)))    \
-                return false;                                                 \
+              if (!NAME(lynx,squirt_out_relocs) (abfd, obj_datasec (abfd)))   \
+                return FALSE;                                                 \
             }                                                                 \
       }
@@ -84 +86 @@
 #include "aout/aout64.h"
 
+void NAME (lynx,swap_std_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
+void NAME (lynx,swap_ext_reloc_out)
+  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
+void NAME (lynx,swap_ext_reloc_in)
+  PARAMS ((bfd *, struct reloc_ext_external *, arelent *, asymbol **,
+           bfd_size_type));
+void NAME (lynx,swap_std_reloc_in)
+  PARAMS ((bfd *, struct reloc_std_external *, arelent *, asymbol **,
+           bfd_size_type));
+bfd_boolean NAME (lynx,slurp_reloc_table)
+  PARAMS ((bfd *, sec_ptr, asymbol **));
+bfd_boolean NAME (lynx,squirt_out_relocs)
+  PARAMS ((bfd *, asection *));
+long NAME (lynx,canonicalize_reloc)
+  PARAMS ((bfd *, sec_ptr, arelent **, asymbol **));
+
 #ifdef LYNX_CORE
 
 char *lynx_core_file_failing_command ();
 int lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
+bfd_boolean lynx_core_file_matches_executable_p ();
 const bfd_target *lynx_core_file_p ();
 
@@ -142 +161 @@
      from the abs section, or as a symbol which has an abs value.
      check for that here
-     */
+  */
 
 
@@ -152 +171 @@
         {
           /* Whoops, looked like an abs symbol, but is really an offset
-           from the abs section */
+             from the abs section */
           r_index = 0;
           r_extern = 0;
@@ -360 +379 @@
   struct aoutdata *su = &(abfd->tdata.aout_data->a);
 
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
+  cache_ptr->address = H_GET_32 (abfd, bytes->r_address);
 
   r_index = bytes->r_index[1];
@@ -379 +398 @@
 /* Reloc hackery */
 
-boolean
+bfd_boolean
 NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
      bfd *abfd;
@@ -385 +404 @@
      asymbol **symbols;
 {
-  unsigned int count;
+  bfd_size_type count;
   bfd_size_type reloc_size;
   PTR relocs;
@@ -392 +411 @@
 
   if (asect->relocation)
-    return true;
+    return TRUE;
 
   if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
+    return TRUE;
 
   if (asect == obj_datasec (abfd))
@@ -410 +429 @@
 
   bfd_set_error (bfd_error_invalid_operation);
-  return false;
+  return FALSE;
 
 doit:
   if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
+    return FALSE;
   each_size = obj_reloc_entry_size (abfd);
 
@@ -420 +439 @@
 
 
-  reloc_cache = (arelent *) bfd_malloc (count * sizeof (arelent));
+  reloc_cache = (arelent *) bfd_zmalloc (count * sizeof (arelent));
   if (!reloc_cache && count != 0)
-    return false;
-  memset (reloc_cache, 0, count * sizeof (arelent));
+    return FALSE;
 
   relocs = (PTR) bfd_alloc (abfd, reloc_size);
@@ -429 +447 @@
     {
       free (reloc_cache);
-      return false;
-    }
-
-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
+      return FALSE;
+    }
+
+  if (bfd_bread (relocs, reloc_size, abfd) != reloc_size)
     {
       bfd_release (abfd, relocs);
       free (reloc_cache);
-      return false;
+      return FALSE;
     }
 
@@ -448 +466 @@
         {
           NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
-                                        bfd_get_symcount (abfd));
+                                        (bfd_size_type) bfd_get_symcount (abfd));
         }
     }
@@ -460 +478 @@
         {
           NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
-                                        bfd_get_symcount (abfd));
+                                        (bfd_size_type) bfd_get_symcount (abfd));
         }
 
@@ -468 +486 @@
   asect->relocation = reloc_cache;
   asect->reloc_count = count;
-  return true;
+  return TRUE;
 }
 
@@ -475 +493 @@
 /* Write out a relocation section into an object file.  */
 
-boolean
+bfd_boolean
 NAME(lynx,squirt_out_relocs) (abfd, section)
      bfd *abfd;
@@ -485 +503 @@
 
   unsigned int count = section->reloc_count;
-  size_t natsize;
+  bfd_size_type natsize;
 
   if (count == 0)
-    return true;
+    return TRUE;
 
   each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size * count;
+  natsize = count;
+  natsize *= each_size;
   native = (unsigned char *) bfd_zalloc (abfd, natsize);
   if (!native)
-    return false;
+    return FALSE;
 
   generic = section->orelocation;
@@ -513 +532 @@
     }
 
-  if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize)
+  if (bfd_bwrite ((PTR) native, natsize, abfd) != natsize)
     {
       bfd_release (abfd, native);
-      return false;
+      return FALSE;
     }
   bfd_release (abfd, native);
 
-  return true;
+  return TRUE;
 }