X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fsize.c;h=b78cba02ba04c6d873e964265506176cdc14bab3;hb=56424b64208bd26f7e7c787b4d0af06287d387e4;hp=c6c9cf1c393ce0997f9e838e4fb4fe44cd1e0f0f;hpb=65de42c0f95fece900176948415027a83bc83451;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/size.c b/binutils/size.c
index c6c9cf1c39..b78cba02ba 100644
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -1,22 +1,22 @@
 /* size.c -- report size of various sections of an executable file.
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-   Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-This file is part of GNU Binutils.
+   This file is part of GNU Binutils.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Extensions/incompatibilities:
    o - BSD output has filenames at the end.
@@ -26,13 +26,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    o - We also handle core files.
    o - We also handle archives.
    If you write shell scripts which manipulate this info then you may be
-   out of luck; there's no --compatibility or --pedantic option.
-*/
+   out of luck; there's no --compatibility or --pedantic option.  */
 
 #include "bfd.h"
-#include "getopt.h"
 #include "bucomm.h"
 #include "libiberty.h"
+#include "getopt.h"
 
 #ifndef BSD_DEFAULT
 #define BSD_DEFAULT 1
@@ -43,71 +42,82 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 enum
   {
     decimal, octal, hex
-  } radix = decimal;
-int berkeley_format = BSD_DEFAULT;	/* 0 means use AT&T-style output.  */
+  }
+radix = decimal;
+
+/* 0 means use AT&T-style output.  */
+static int berkeley_format = BSD_DEFAULT;
+
 int show_version = 0;
 int show_help = 0;
+int show_totals = 0;
+
+static bfd_size_type total_bsssize;
+static bfd_size_type total_datasize;
+static bfd_size_type total_textsize;
 
 /* Program exit status.  */
 int return_code = 0;
 
 static char *target = NULL;
 
-/* Static declarations */
-
-static void usage PARAMS ((FILE *, int));
-static void display_file PARAMS ((char *filename));
-static void display_bfd PARAMS ((bfd *));
-static void display_archive PARAMS ((bfd *));
-static int size_number PARAMS ((bfd_size_type));
-#if 0
-static void lprint_number PARAMS ((int, bfd_size_type));
-#endif
-static void rprint_number PARAMS ((int, bfd_size_type));
-static void print_berkeley_format PARAMS ((bfd *));
-static void sysv_internal_sizer PARAMS ((bfd *, asection *, PTR));
-static void sysv_internal_printer PARAMS ((bfd *, asection *, PTR));
-static void print_sysv_format PARAMS ((bfd *));
-static void print_sizes PARAMS ((bfd * file));
-static void berkeley_sum PARAMS ((bfd *, sec_ptr, PTR));
+/* Static declarations.  */
+
+static void usage (FILE *, int);
+static void display_file (char *);
+static void display_bfd (bfd *);
+static void display_archive (bfd *);
+static int size_number (bfd_size_type);
+static void rprint_number (int, bfd_size_type);
+static void print_berkeley_format (bfd *);
+static void sysv_internal_sizer (bfd *, asection *, void *);
+static void sysv_internal_printer (bfd *, asection *, void *);
+static void print_sysv_format (bfd *);
+static void print_sizes (bfd * file);
+static void berkeley_sum (bfd *, sec_ptr, void *);
 
 static void
-usage (stream, status)
-     FILE *stream;
-     int status;
+usage (FILE *stream, int status)
 {
-  fprintf (stream, _("\
-Usage: %s [-A | --format=sysv | -B | --format=berkeley]\n\
-       [-o | --radix=8 | -d | --radix=10 | -h | --radix=16]\n\
-       [-V | --version] [--target=bfdname] [--help] [file...]\n"),
-	   program_name);
+  fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
+  fprintf (stream, _(" Displays the sizes of sections inside binary files\n"));
+  fprintf (stream, _(" If no input file(s) are specified, a.out is assumed\n"));
+  fprintf (stream, _(" The options are:\n\
+  -A|-B     --format={sysv|berkeley}  Select output style (default is %s)\n\
+  -o|-d|-x  --radix={8|10|16}         Display numbers in octal, decimal or hex\n\
+  -t        --totals                  Display the total sizes (Berkeley only)\n\
+            --target=<bfdname>        Set the binary file format\n\
+            @<file>                   Read options from <file>\n\
+  -h        --help                    Display this information\n\
+  -v        --version                 Display the program's version\n\
+\n"),
 #if BSD_DEFAULT
-  fputs (_("default is --format=berkeley\n"), stream);
+  "berkeley"
 #else
-  fputs (_("default is --format=sysv\n"), stream);
+  "sysv"
 #endif
+);
   list_supported_targets (program_name, stream);
   if (status == 0)
     fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
   exit (status);
 }
 
-struct option long_options[] =
+static struct option long_options[] =
 {
   {"format", required_argument, 0, 200},
   {"radix", required_argument, 0, 201},
   {"target", required_argument, 0, 202},
+  {"totals", no_argument, &show_totals, 1},
   {"version", no_argument, &show_version, 1},
   {"help", no_argument, &show_help, 1},
   {0, no_argument, 0, 0}
 };
 
-int main PARAMS ((int, char **));
+int main (int, char **);
 
 int
-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)
 {
   int temp;
   int c;
@@ -124,10 +134,12 @@ main (argc, argv)
   program_name = *argv;
   xmalloc_set_program_name (program_name);
 
+  expandargv (&argc, &argv);
+
   bfd_init ();
   set_default_bfd_target ();
 
-  while ((c = getopt_long (argc, argv, "ABVdfox", long_options,
+  while ((c = getopt_long (argc, argv, "ABHhVvdfotx", long_options,
 			   (int *) 0)) != EOF)
     switch (c)
       {
@@ -181,6 +193,7 @@ main (argc, argv)
       case 'B':
 	berkeley_format = 1;
 	break;
+      case 'v':
       case 'V':
 	show_version = 1;
 	break;
@@ -193,6 +206,9 @@ main (argc, argv)
       case 'o':
 	radix = octal;
 	break;
+      case 't':
+	show_totals = 1;
+	break;
       case 'f': /* FIXME : For sysv68, `-f' means `full format', i.e.
 		   `[fname:] M(.text) + N(.data) + O(.bss) + P(.comment) = Q'
 		   where `fname: ' appears only if there are >= 2 input files,
@@ -205,6 +221,8 @@ main (argc, argv)
 	break;
       case 0:
 	break;
+      case 'h':
+      case 'H':
       case '?':
 	usage (stderr, 1);
       }
@@ -220,14 +238,27 @@ main (argc, argv)
     for (; optind < argc;)
       display_file (argv[optind++]);
 
+  if (show_totals && berkeley_format)
+    {
+      bfd_size_type total = total_textsize + total_datasize + total_bsssize;
+
+      rprint_number (7, total_textsize);
+      putchar('\t');
+      rprint_number (7, total_datasize);
+      putchar('\t');
+      rprint_number (7, total_bsssize);
+      printf (((radix == octal) ? "\t%7lo\t%7lx\t" : "\t%7lu\t%7lx\t"),
+	      (unsigned long) total, (unsigned long) total);
+      fputs ("(TOTALS)\n", stdout);
+    }
+
   return return_code;
 }
 
 /* Display stats on file or archive member ABFD.  */
 
 static void
-display_bfd (abfd)
-     bfd *abfd;
+display_bfd (bfd *abfd)
 {
   char **matching;
 
@@ -253,7 +284,7 @@ display_bfd (abfd)
 
   if (bfd_check_format_matches (abfd, bfd_core, &matching))
     {
-      CONST char *core_cmd;
+      const char *core_cmd;
 
       print_sizes (abfd);
       fputs (" (core file", stdout);
@@ -278,10 +309,10 @@ display_bfd (abfd)
 }
 
 static void
-display_archive (file)
-     bfd *file;
+display_archive (bfd *file)
 {
   bfd *arfile = (bfd *) NULL;
+  bfd *last_arfile = (bfd *) NULL;
 
   for (;;)
     {
@@ -299,15 +330,25 @@ display_archive (file)
 	}
 
       display_bfd (arfile);
-      /* Don't close the archive elements; we need them for next_archive */
+
+      if (last_arfile != NULL)
+	bfd_close (last_arfile);
+      last_arfile = arfile;
     }
+
+  if (last_arfile != NULL)
+    bfd_close (last_arfile);
 }
 
 static void
-display_file (filename)
-     char *filename;
+display_file (char *filename)
 {
-  bfd *file = bfd_openr (filename, target);
+  bfd *file;
+
+  if (get_file_size (filename) < 1)
+    return;
+
+  file = bfd_openr (filename, target);
   if (file == NULL)
     {
       bfd_nonfatal (filename);
@@ -315,12 +356,12 @@ display_file (filename)
       return;
     }
 
-  if (bfd_check_format (file, bfd_archive) == true)
+  if (bfd_check_format (file, bfd_archive))
     display_archive (file);
   else
     display_bfd (file);
 
-  if (bfd_close (file) == false)
+  if (!bfd_close (file))
     {
       bfd_nonfatal (filename);
       return_code = 1;
@@ -331,10 +372,10 @@ display_file (filename)
 /* This is what lexical functions are for.  */
 
 static int
-size_number (num)
-     bfd_size_type num;
+size_number (bfd_size_type num)
 {
   char buffer[40];
+
   sprintf (buffer,
 	   (radix == decimal ? "%lu" :
 	   ((radix == octal) ? "0%lo" : "0x%lx")),
@@ -343,32 +384,11 @@ size_number (num)
   return strlen (buffer);
 }
 
-#if 0
-
-/* This is not used.  */
-
 static void
-lprint_number (width, num)
-     int width;
-     bfd_size_type num;
+rprint_number (int width, bfd_size_type num)
 {
   char buffer[40];
-  sprintf (buffer,
-	   (radix == decimal ? "%lu" :
-	   ((radix == octal) ? "0%lo" : "0x%lx")),
-	   (unsigned long) num);
-
-  printf ("%-*s", width, buffer);
-}
 
-#endif
-
-static void
-rprint_number (width, num)
-     int width;
-     bfd_size_type num;
-{
-  char buffer[40];
   sprintf (buffer,
 	   (radix == decimal ? "%lu" :
 	   ((radix == octal) ? "0%lo" : "0x%lx")),
@@ -382,10 +402,8 @@ static bfd_size_type datasize;
 static bfd_size_type textsize;
 
 static void
-berkeley_sum (abfd, sec, ignore)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     sec_ptr sec;
-     PTR ignore ATTRIBUTE_UNUSED;
+berkeley_sum (bfd *abfd ATTRIBUTE_UNUSED, sec_ptr sec,
+	      void *ignore ATTRIBUTE_UNUSED)
 {
   flagword flags;
   bfd_size_type size;
@@ -394,7 +412,7 @@ berkeley_sum (abfd, sec, ignore)
   if ((flags & SEC_ALLOC) == 0)
     return;
 
-  size = bfd_get_section_size_before_reloc (sec);
+  size = bfd_get_section_size (sec);
   if ((flags & SEC_CODE) != 0 || (flags & SEC_READONLY) != 0)
     textsize += size;
   else if ((flags & SEC_HAS_CONTENTS) != 0)
@@ -403,9 +421,8 @@ berkeley_sum (abfd, sec, ignore)
     bsssize += size;
 }
 
-static void 
-print_berkeley_format (abfd)
-     bfd *abfd;
+static void
+print_berkeley_format (bfd *abfd)
 {
   static int files_seen = 0;
   bfd_size_type total;
@@ -414,20 +431,21 @@ print_berkeley_format (abfd)
   datasize = 0;
   textsize = 0;
 
-  bfd_map_over_sections (abfd, berkeley_sum, (PTR) NULL);
+  bfd_map_over_sections (abfd, berkeley_sum, NULL);
 
   if (files_seen++ == 0)
-#if 0
-    /* Intel doesn't like bss/stk because they don't have core files.  */
-    puts ((radix == octal) ? "   text\t   data\tbss/stk\t    oct\t    hex\tfilename" :
-	  "   text\t   data\tbss/stk\t    dec\t    hex\tfilename");
-#else
     puts ((radix == octal) ? "   text\t   data\t    bss\t    oct\t    hex\tfilename" :
 	  "   text\t   data\t    bss\t    dec\t    hex\tfilename");
-#endif
 
   total = textsize + datasize + bsssize;
 
+  if (show_totals)
+    {
+      total_textsize += textsize;
+      total_datasize += datasize;
+      total_bsssize  += bsssize;
+    }
+
   rprint_number (7, textsize);
   putchar ('\t');
   rprint_number (7, datasize);
@@ -437,6 +455,7 @@ print_berkeley_format (abfd)
 	  (unsigned long) total, (unsigned long) total);
 
   fputs (bfd_get_filename (abfd), stdout);
+
   if (bfd_my_archive (abfd))
     printf (" (ex %s)", bfd_get_filename (bfd_my_archive (abfd)));
 }
@@ -449,36 +468,36 @@ int svi_vmalen = 0;
 int svi_sizelen = 0;
 
 static void
-sysv_internal_sizer (file, sec, ignore)
-     bfd *file ATTRIBUTE_UNUSED;
-     sec_ptr sec;
-     PTR ignore ATTRIBUTE_UNUSED;
+sysv_internal_sizer (bfd *file ATTRIBUTE_UNUSED, sec_ptr sec,
+		     void *ignore ATTRIBUTE_UNUSED)
 {
   bfd_size_type size = bfd_section_size (file, sec);
-  if (!bfd_is_abs_section (sec)
-      && !bfd_is_com_section (sec)
-      && !bfd_is_und_section (sec))
+
+  if (   ! bfd_is_abs_section (sec)
+      && ! bfd_is_com_section (sec)
+      && ! bfd_is_und_section (sec))
     {
       int namelen = strlen (bfd_section_name (file, sec));
+
       if (namelen > svi_namelen)
 	svi_namelen = namelen;
 
       svi_total += size;
+
       if (bfd_section_vma (file, sec) > svi_maxvma)
 	svi_maxvma = bfd_section_vma (file, sec);
     }
 }
 
 static void
-sysv_internal_printer (file, sec, ignore)
-     bfd *file ATTRIBUTE_UNUSED;
-     sec_ptr sec;
-     PTR ignore ATTRIBUTE_UNUSED;
+sysv_internal_printer (bfd *file ATTRIBUTE_UNUSED, sec_ptr sec,
+		       void *ignore ATTRIBUTE_UNUSED)
 {
   bfd_size_type size = bfd_section_size (file, sec);
-  if (!bfd_is_abs_section (sec)
-      && !bfd_is_com_section (sec)
-      && !bfd_is_und_section (sec))
+
+  if (   ! bfd_is_abs_section (sec)
+      && ! bfd_is_com_section (sec)
+      && ! bfd_is_und_section (sec))
     {
       svi_total += size;
 
@@ -491,15 +510,15 @@ sysv_internal_printer (file, sec, ignore)
 }
 
 static void
-print_sysv_format (file)
-     bfd *file;
+print_sysv_format (bfd *file)
 {
-  /* size all of the columns */
+  /* Size all of the columns.  */
   svi_total = 0;
   svi_maxvma = 0;
   svi_namelen = 0;
-  bfd_map_over_sections (file, sysv_internal_sizer, (PTR) NULL);
+  bfd_map_over_sections (file, sysv_internal_sizer, NULL);
   svi_vmalen = size_number ((bfd_size_type)svi_maxvma);
+
   if ((size_t) svi_vmalen < sizeof ("addr") - 1)
     svi_vmalen = sizeof ("addr")-1;
 
@@ -509,12 +528,14 @@ print_sysv_format (file)
 
   svi_total = 0;
   printf ("%s  ", bfd_get_filename (file));
+
   if (bfd_my_archive (file))
     printf (" (ex %s)", bfd_get_filename (bfd_my_archive (file)));
 
   printf (":\n%-*s   %*s   %*s\n", svi_namelen, "section",
 	  svi_sizelen, "size", svi_vmalen, "addr");
-  bfd_map_over_sections (file, sysv_internal_printer, (PTR) NULL);
+
+  bfd_map_over_sections (file, sysv_internal_printer, NULL);
 
   printf ("%-*s   ", svi_namelen, "Total");
   rprint_number (svi_sizelen, svi_total);
@@ -522,8 +543,7 @@ print_sysv_format (file)
 }
 
 static void
-print_sizes (file)
-     bfd *file;
+print_sizes (bfd *file)
 {
   if (berkeley_format)
     print_berkeley_format (file);