X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fmips-tdump.c;h=cfdc0d4ddc62c3dc66ae80f41eb01df2b9586026;hb=3d6d14e979a50c5e348858c9789f211aa10a64eb;hp=a6dcb57cfa063c17bbba71144dc2f5b20c757182;hpb=d25dc80e2b6453982a01ef22602418db72c811d0;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/mips-tdump.c b/gcc/mips-tdump.c
index a6dcb57cfa0..cfdc0d4ddc6 100644
--- a/gcc/mips-tdump.c
+++ b/gcc/mips-tdump.c
@@ -1,6 +1,6 @@
 /* Read and manage MIPS symbol tables from object modules.
    Copyright (C) 1991, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004,
-   2006, 2007 Free Software Foundation, Inc.
+   2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
    Contributed by hartzell@boulder.colorado.edu,
    Rewritten by meissner@osf.org.
 
@@ -883,7 +883,7 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
 	if (want_scope)
 	  {
 	    if (free_scope == (scope_t *) 0)
-	      scope_ptr = xmalloc (sizeof (scope_t));
+	      scope_ptr = (scope_t *) xmalloc (sizeof (scope_t));
 	    else
 	      {
 		scope_ptr = free_scope;
@@ -937,7 +937,7 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
 	if (want_scope)
 	  {
 	    if (free_scope == (scope_t *) 0)
-	      scope_ptr = xmalloc (sizeof (scope_t));
+	      scope_ptr = (scope_t *) xmalloc (sizeof (scope_t));
 	    else
 	      {
 		scope_ptr = free_scope;
@@ -980,19 +980,19 @@ print_symbol (SYMR *sym_ptr, int number, const char *strbase, AUXU *aux_base,
 	       scope_ptr != (scope_t *) 0;
 	       scope_ptr = scope_ptr->prev)
 	    {
-	      const char *class;
+	      const char *sclass;
 	      if (scope_ptr->st == st_Proc || scope_ptr->st == st_StaticProc)
-		class = "func.";
+		sclass = "func.";
 	      else if (scope_ptr->st == st_File)
-		class = "file";
+		sclass = "file";
 	      else if (scope_ptr->st == st_Block && scope_ptr->sc == sc_Text)
-		class = "block";
+		sclass = "block";
 	      else if (scope_ptr->st == st_Block && scope_ptr->sc == sc_Info)
-		class = "type";
+		sclass = "type";
 	      else
-		class = "???";
+		sclass = "???";
 
-	      printf (" %ld [%s]", scope_ptr->open_sym, class);
+	      printf (" %ld [%s]", scope_ptr->open_sym, sclass);
 	    }
 	  printf ("\n");
 	}
@@ -1116,7 +1116,7 @@ print_file_desc (FDR *fdp, int number)
 	  (fdp->fBigendian) ? "BIG" : "LITTLE");
 
   printf ("    Debug level = %-10s Language    = %s\n",
-	  glevel_to_string (fdp->glevel),
+	  glevel_to_string ((glevel_t) fdp->glevel),
 	  lang_to_string((lang_t) fdp->lang));
 
   printf ("    Adr         = 0x%08lx\n\n", (long) fdp->adr);
@@ -1345,41 +1345,44 @@ read_tfile (void)
 
   print_sym_hdr (&sym_hdr);
 
-  lines = read_seek (NULL, sym_hdr.cbLine, sym_hdr.cbLineOffset,
-		     "Line numbers");
+  lines = (LINER *) read_seek (NULL, sym_hdr.cbLine, sym_hdr.cbLineOffset,
+			       "Line numbers");
 
-  dense_nums = read_seek (NULL, sym_hdr.idnMax * sizeof (DNR),
-			  sym_hdr.cbDnOffset, "Dense numbers");
+  dense_nums = (DNR *) read_seek (NULL, sym_hdr.idnMax * sizeof (DNR),
+				  sym_hdr.cbDnOffset, "Dense numbers");
 
-  proc_desc = read_seek (NULL, sym_hdr.ipdMax * sizeof (PDR),
-			 sym_hdr.cbPdOffset, "Procedure tables");
+  proc_desc = (PDR *) read_seek (NULL, sym_hdr.ipdMax * sizeof (PDR),
+				 sym_hdr.cbPdOffset, "Procedure tables");
 
-  l_symbols = read_seek (NULL, sym_hdr.isymMax * sizeof (SYMR),
-			 sym_hdr.cbSymOffset, "Local symbols");
+  l_symbols = (SYMR *) read_seek (NULL, sym_hdr.isymMax * sizeof (SYMR),
+				  sym_hdr.cbSymOffset, "Local symbols");
 
-  opt_symbols = read_seek (NULL, sym_hdr.ioptMax * sizeof (OPTR),
-			   sym_hdr.cbOptOffset, "Optimization symbols");
+  opt_symbols = (OPTR *) read_seek (NULL, sym_hdr.ioptMax * sizeof (OPTR),
+				    sym_hdr.cbOptOffset,
+				    "Optimization symbols");
 
-  aux_symbols = read_seek (NULL, sym_hdr.iauxMax * sizeof (AUXU),
-			   sym_hdr.cbAuxOffset, "Auxiliary symbols");
+  aux_symbols = (AUXU *) read_seek (NULL, sym_hdr.iauxMax * sizeof (AUXU),
+				    sym_hdr.cbAuxOffset, "Auxiliary symbols");
 
   if (sym_hdr.iauxMax > 0)
-    aux_used = xcalloc (sym_hdr.iauxMax, 1);
+    aux_used = (char *) xcalloc (sym_hdr.iauxMax, 1);
 
-  l_strings = read_seek (NULL, sym_hdr.issMax,
-			 sym_hdr.cbSsOffset, "Local string table");
+  l_strings = (char *) read_seek (NULL, sym_hdr.issMax,
+				  sym_hdr.cbSsOffset, "Local string table");
 
-  e_strings = read_seek (NULL, sym_hdr.issExtMax,
-			 sym_hdr.cbSsExtOffset, "External string table");
+  e_strings = (char *) read_seek (NULL, sym_hdr.issExtMax,
+				  sym_hdr.cbSsExtOffset,
+				  "External string table");
 
-  file_desc = read_seek (NULL, sym_hdr.ifdMax * sizeof (FDR),
-			 sym_hdr.cbFdOffset, "File tables");
+  file_desc = (FDR *) read_seek (NULL, sym_hdr.ifdMax * sizeof (FDR),
+				 sym_hdr.cbFdOffset, "File tables");
 
-  rfile_desc = read_seek (NULL, sym_hdr.crfd * sizeof (ulong),
-			  sym_hdr.cbRfdOffset, "Relative file tables");
+  rfile_desc = (ulong *) read_seek (NULL, sym_hdr.crfd * sizeof (ulong),
+				    sym_hdr.cbRfdOffset,
+				    "Relative file tables");
 
-  e_symbols = read_seek (NULL, sym_hdr.iextMax * sizeof (EXTR),
-			 sym_hdr.cbExtOffset, "External symbols");
+  e_symbols = (EXTR *) read_seek (NULL, sym_hdr.iextMax * sizeof (EXTR),
+				  sym_hdr.cbExtOffset, "External symbols");
 }
 
 
@@ -1411,7 +1414,7 @@ main (int argc, char **argv)
   if (version)
     {
       printf ("mips-tdump %s%s\n", pkgversion_string, version_string);
-      fputs ("Copyright (C) 2007 Free Software Foundation, Inc.\n", stdout);
+      fputs ("Copyright (C) 2010 Free Software Foundation, Inc.\n", stdout);
       fputs ("This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n",
              stdout);