* config/tc-xtensa.c (xg_add_opcode_fix): Number operands starting

[deliverable/binutils-gdb.git] / binutils / sysdump.c

diff --git a/binutils/sysdump.c b/binutils/sysdump.c
index 2d0362bcf7a60779c8b87595ebc954f46c94b9b1..ec19472558fdde818352187d0b809143d499164f 100644 (file)
--- a/binutils/sysdump.c
+++ b/binutils/sysdump.c
@@ -1,5 +1,5 @@
 /* Sysroff object format dumper.
-   Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002
+   Copyright 1994, 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2005
    Free Software Foundation, Inc.
 
    This file is part of GNU Binutils.
@@ -16,8 +16,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 
 /* Written by Steve Chamberlain <sac@cygnus.com>.
@@ -40,35 +40,24 @@ static int code;
 static int addrsize = 4;
 static FILE *file;
 
-static void dh PARAMS ((unsigned char *, int));
-static void itheader PARAMS ((char *, int));
-static void p PARAMS ((void));
-static void tabout PARAMS ((void));
-static void pbarray PARAMS ((barray *));
-static int getone PARAMS ((int));
-static int opt PARAMS ((int));
-static void must PARAMS ((int));
-static void tab PARAMS ((int, char *));
-static void dump_symbol_info PARAMS ((void));
-static void derived_type PARAMS ((void));
-static void module PARAMS ((void));
-static void show_usage PARAMS ((FILE *, int));
-
-extern char *getCHARS PARAMS ((unsigned char *, int *, int, int));
-extern int fillup PARAMS ((char *));
-extern barray getBARRAY PARAMS ((unsigned char *, int *, int, int));
-extern int getINT PARAMS ((unsigned char *, int *, int, int));
-extern int getBITS PARAMS ((char *, int *, int, int));
-extern void sysroff_swap_tr_in PARAMS ((void));
-extern void sysroff_print_tr_out PARAMS ((void));
-extern int main PARAMS ((int, char **));
-
-char *
-getCHARS (ptr, idx, size, max)
-     unsigned char *ptr;
-     int *idx;
-     int size;
-     int max;
+static void dh (unsigned char *, int);
+static void itheader (char *, int);
+static void p (void);
+static void tabout (void);
+static void pbarray (barray *);
+static int getone (int);
+static int opt (int);
+static void must (int);
+static void tab (int, char *);
+static void dump_symbol_info (void);
+static void derived_type (void);
+static void module (void);
+static void show_usage (FILE *, int);
+
+extern int main (int, char **);
+
+static char *
+getCHARS (unsigned char *ptr, int *idx, int size, int max)
 {
   int oc = *idx / 8;
   char *r;
@@ -93,9 +82,7 @@ getCHARS (ptr, idx, size, max)
 }
 
 static void
-dh (ptr, size)
-     unsigned char *ptr;
-     int size;
+dh (unsigned char *ptr, int size)
 {
   int i;
   int j;
@@ -126,9 +113,8 @@ dh (ptr, size)
     }
 }
 
-int
-fillup (ptr)
-     char *ptr;
+static int
+fillup (unsigned char *ptr)
 {
   int size;
   int sum;
@@ -150,12 +136,9 @@ fillup (ptr)
   return size - 1;
 }
 
-barray
-getBARRAY (ptr, idx, dsize, max)
-     unsigned char *ptr;
-     int *idx;
-     int dsize ATTRIBUTE_UNUSED;
-     int max ATTRIBUTE_UNUSED;
+static barray
+getBARRAY (unsigned char *ptr, int *idx, int dsize ATTRIBUTE_UNUSED,
+          int max ATTRIBUTE_UNUSED)
 {
   barray res;
   int i;
@@ -171,12 +154,8 @@ getBARRAY (ptr, idx, dsize, max)
   return res;
 }
 
-int
-getINT (ptr, idx, size, max)
-     unsigned char *ptr;
-     int *idx;
-     int size;
-     int max;
+static int
+getINT (unsigned char *ptr, int *idx, int size, int max)
 {
   int n = 0;
   int byte = *idx / 8;
@@ -211,11 +190,8 @@ getINT (ptr, idx, size, max)
   return n;
 }
 
-int
-getBITS (ptr, idx, size, max)
-     char *ptr;
-     int *idx;
-     int size, max;
+static int
+getBITS (unsigned char *ptr, int *idx, int size, int max)
 {
   int byte = *idx / 8;
   int bit = *idx % 8;
@@ -229,9 +205,7 @@ getBITS (ptr, idx, size, max)
 }
 
 static void
-itheader (name, code)
-     char *name;
-     int code;
+itheader (char *name, int code)
 {
   printf ("\n%s 0x%02x\n", name, code);
 }
@@ -239,7 +213,7 @@ itheader (name, code)
 static int indent;
 
 static void
-p ()
+p (void)
 {
   int i;
 
@@ -250,14 +224,13 @@ p ()
 }
 
 static void
-tabout ()
+tabout (void)
 {
   p ();
 }
 
 static void
-pbarray (y)
-     barray *y;
+pbarray (barray *y)
 {
   int x;
 
@@ -282,24 +255,23 @@ pbarray (y)
 
 #define IT_tr_CODE     0x7f
 
-void
-sysroff_swap_tr_in()
+static void
+sysroff_swap_tr_in (void)
 {
-  char raw[255];
+  unsigned char raw[255];
 
   memset (raw, 0, 255);
   fillup (raw);
 }
 
-void
-sysroff_print_tr_out()
+static void
+sysroff_print_tr_out (void)
 {
   itheader ("tr", IT_tr_CODE);
 }
 
 static int
-getone (type)
-     int type;
+getone (int type)
 {
   int c = getc (file);
 
@@ -531,66 +503,20 @@ getone (type)
 }
 
 static int
-opt (x)
-     int x;
+opt (int x)
 {
   return getone (x);
 }
 
-#if 0
-
-/* This is no longer used.  */
-
 static void
-unit_info_list ()
-{
-  while (opt (IT_un_CODE))
-    {
-      getone (IT_us_CODE);
-
-      while (getone (IT_sc_CODE))
-       getone (IT_ss_CODE);
-
-      while (getone (IT_er_CODE))
-       ;
-
-      while (getone (IT_ed_CODE))
-       ;
-    }
-}
-
-#endif
-
-#if 0
-
-/* This is no longer used.  */
-
-static void
-object_body_list ()
-{
-  while (getone (IT_sh_CODE))
-    {
-      while (getone (IT_ob_CODE))
-       ;
-      while (getone (IT_rl_CODE))
-       ;
-    }
-}
-
-#endif
-
-static void
-must (x)
-     int x;
+must (int x)
 {
   if (!getone (x))
     printf ("WANTED %x!!\n", x);
 }
 
 static void
-tab (i, s)
-     int i;
-     char *s;
+tab (int i, char *s)
 {
   indent += i;
 
@@ -603,7 +529,7 @@ tab (i, s)
 }
 
 static void
-dump_symbol_info ()
+dump_symbol_info (void)
 {
   tab (1, "SYMBOL INFO");
 
@@ -621,7 +547,7 @@ dump_symbol_info ()
 }
 
 static void
-derived_type ()
+derived_type (void)
 {
   tab (1, "DERIVED TYPE");
 
@@ -674,47 +600,8 @@ derived_type ()
   tab (-1, "");
 }
 
-#if 0
-
-/* This is no longer used.  */
-
-static void
-program_structure ()
-{
-  tab (1, "PROGRAM STRUCTURE");
-  while (opt (IT_dps_CODE))
-    {
-      must (IT_dso_CODE);
-      opt (IT_dss_CODE);
-      dump_symbol_info ();
-      must (IT_dps_CODE);
-    }
-  tab (-1, "");
-}
-
-#endif
-
-#if 0
-
-/* This is no longer used.  */
-
-static void
-debug_list ()
-{
-  tab (1, "DEBUG LIST");
-
-  must (IT_du_CODE);
-  opt (IT_dus_CODE);
-  program_structure ();
-  must (IT_dln_CODE);
-
-  tab (-1, "");
-}
-
-#endif
-
 static void
-module ()
+module (void)
 {
   int c = 0;
   int l = 0;
@@ -730,17 +617,6 @@ module ()
     }
   while (getone (c) && c != IT_tr_CODE);
 
-#if 0
-  must (IT_cs_CODE);
-  must (IT_hd_CODE);
-  opt (IT_hs_CODE);
-
-  unit_info_list ();
-  object_body_list ();
-  debug_list ();
-
-  must (IT_tr_CODE);
-#endif
   tab (-1, "");
 
   c = getc (file);
@@ -760,9 +636,7 @@ module ()
 char *program_name;
 
 static void
-show_usage (file, status)
-     FILE *file;
-     int status;
+show_usage (FILE *file, int status)
 {
   fprintf (file, _("Usage: %s [option(s)] in-file\n"), program_name);
   fprintf (file, _("Print a human readable interpretation of a SYSROFF object file\n"));
@@ -776,9 +650,7 @@ show_usage (file, status)
 }
 
 int
-main (ac, av)
-     int ac;
-     char **av;
+main (int ac, char **av)
 {
   char *input_file = NULL;
   int opt;
@@ -801,6 +673,8 @@ main (ac, av)
   program_name = av[0];
   xmalloc_set_program_name (program_name);
 
+  expandargv (&ac, &av);
+
   while ((opt = getopt_long (ac, av, "HhVv", long_options, (int *) NULL)) != EOF)
     {
       switch (opt)