* Makefile.in (VERSION): Bump to 4.7.4.

	* Makefile.in (SFILES_MAINDIR):  Add typeprint.c, c-typeprint.c,
	  m2-typeprint.c, c-valprint.c cp-valprint.c m2-valprint.c.
	* Makefile.in (HFILES):  Add valprint.h.
	* Makefile.in (OBS):  Add typeprint.o, c-typeprint.o,
	  m2-typeprint.o, c-valprint.o, cp-valprint.o m2-valprint.o.
	* typeprint.c, typeprint.h:  New files for language independent
	  type printing functions.
	* c-typeprint.c, m2-typeprint.c:  New files for language dependent
	  type printing functions and definitions.
	* valprint.h:  New include file for language independent value
	  printing definitions.
	* c-valprint.c, cp-valprint.c, m2-valprint.c:  New files for language
	  dependent value printing functions.
	* c-exp.y (production ptype):  Add range_type variable and use new
	  create_range_type function.
	* c-exp.y (tokentab2, tokentab3), c-lang.c (c_op_print_tab),
	  infcmd.c (path_var_name), language.c (unk_op_print_tab),
	  m2-lang.c (m2_op_print_tab):  Change from ANSI-obsolescent
	  "const static" to ANSI-conformant "static const".
	* c-exp.y (c_create_fundamental_type):  Remove unused nbytes.
	* c-exp.y (c_language_defn, cplus_language_defn):  Add c_print_type,
	  and c_val_print.
	* c-lang.h (c_print_type, c_val_print):  Add prototypes.
	* coffread.c (decode_type):  Add range_type variable and call to
	  new create_range_type function.
	* complaints.c (complain):  Remove unused val variable.
	* complaints.c (_initialize_complaints):  Make it void.
	* convex-tdep.c (value_of_trapped_internalvar):  Add range_type
	  variable and call new create_range_type function.
	* defs.h (enum val_prettyprint):  Move enum from value.h to here
	  so we can avoid having to include value.h just for prototypes that
	  need the enum (thanks ANSI).
	* dwarfread.c (struct_type):  Local anonymous_size variable is
	  only used if !BITS_BIG_ENDIAN.
	* dwarfread.c (decode_subscript_data_item):  Add rangetype
	  variable and call new create_range_type function.
	* elfread.c (elf_symfile_read):  Remove unused dbx and text_sect
	  variables.
	* eval.c (evaluate_subexp):  Remove unused local variable name
	  and the statement with no side effects that initializes it.
	* expprint.c (print_subexp):  Change local_printstr to
	  LA_PRINT_STRING.
	* gdbtypes.c (create_range_type):  New function that creates
	  a range type using code fragments from object file readers as
	  an example of what has to be initialized.
	* gdbtypes.c (create_array_type):  Removed index_type, low_bound,
	  and high_bound parameters, replaced with a single range_type
	  parameter.  Change function body to use passed in range_type
	  rather than handcrafting one.
	* gdbtypes.h (create_range_type):  Add prototype.
	* gdbtypes.h (create_array_type):  Change prototype parameters.
	* infrun.c (normal_stop):  Remove unused local variables tem and c.
	* infrun.c (hook_stop_stub):  Return 0 rather than random value.
	* language.c (unk_lang_print_type, unk_lang_val_print):  Add
	  stub functions that call error if called.
	* language.c (unknown_language_defn, auto_language_defn,
	  local_language_defn):  Add initializers unk_lang_print_type and
	  unk_lang_val_print.
	* language.h (struct language_defn):  Reformat for larger
	  comments, add la_print_type and la_val_print members.  Add
	  LA_PRINT_TYPE and LA_VAL_PRINT macros.  Change local_printchar
	  to LA_PRINT_CHAR and local_printstr to LA_PRINT_STRING.
	* m2-lang.c (m2_create_fundamental_type):  Remove unused local
	  variable nbytes.
	* m2-lang.c (m2_language_defn):  Add initializers m2_print_type
	  and m2_val_print.
	* m2-lang.h (m2_print_type, m2_val_print):  Add prototypes.
	* main.c (execute_command): Remove unused local variable cmdlines.
	* main.c (echo_command), stabsread.c (read_type), printcmd.c
	  (clear_displays), symmisc.c (block_depth), values.c
	  (clear_value_history):
	  Make testing of truth value of assignment result explicit.
	* mipsread.c (upgrade_type):  Update FIXME to include future use
	  of create_range_type.
	* printcmd.c (ptype_command, ptype_eval, whatis_command,
	  whatis_exp, maintenance_print_type):  Move prototypes and functions
	  to new typeprint.c.
	* printcmd.c (_initialize_printcmd):  Move add_com calls for
	  ptype_command and whatis_command to new typeprint.c.
	* ser-bsd.c (serial_open):  Remove unused variable sgttyb.
	* source.c (find_source_lines):  Local variable c only used
	  when LSEEK_NOT_LINEAR is defined.
	* stabsread.c (read_array_type):  Use new create_range_type
	  function.
	* stabsread.c (read_range_type):  Add new index_type variable and
	  call new create_range_type function rather than handcrafting
	  range types.
	* symmisc.c (type_print_1):  Change usages to LA_PRINT_TYPE.
	* symtab.c (typedef_print usages):  Use c_typedef_print, renamed.
	* symtab.c (type_print_base usages):  Use c_type_print_base.
	* symtab.c (type_print_varspec_prefix usages):  Use
	  c_type_print_varspec_prefix.
	* symtab.c (type_print_method_args usages):  Use
	  cp_type_print_method_args.
	* valprint.c:  Completely ripped apart and the fragments used
	  to create c-valprint.c, cp-valprint.c, m2-valprint.c, and
	  valprint.h.  Remaining stuff is language independent.
	* value.h (struct fn_field):  Forward declare for prototypes.
	* value.h (type_print_1):  Remove prototype.
	* value.h (enum val_prettyprint):  Moved to defs.h.
	* value.h (typedef_print):  Prototype renamed to c_typedef_print.
	* value.h (baseclass_offset):  Add prototype.
	**** start-sanitize-chill ****
	* Makefile.in (SFILES_MAINDIR):  Add ch-typeprint.c, ch-valprint.c.
	* Makefile.in (OBS):  Add ch-typeprint.o, ch-valprint.o.
	* ch-typeprint.c:  New file for language dependent type printing.
	* ch-valprint.c:  New file for language dependent value printing.
	* ch-exp.y (parse_number):  Remove prototype and stub function.
	* ch-exp.y (decode_integer_literal):  Removed unused digits and
	  temp variables.
	* ch-exp.y (convert_float):  Completely ifdef out for now.
	* ch-exp.y (tokentab2, tokentab3, tokentab4, tokentab5),
	  ch-lang.c (chill_op_print_tab):
	  Change from ANSI-obsolescent "const static" to ANSI-conformant
	  "static const".
	* ch-exp.y (yylex):  Add unhandled storage class enumeration
	  literals to switch statement for completeness.
	* ch-lang.c (chill_create_fundamental_types):  Remove unused
	  nbytes variable.  Change dummy type to 2 bytes to match int.
	  Handle FT_VOID types gratuituously added to chill DWARF by
	  compiler.  Change FT_CHAR case to generate an TYPE_CODE_CHAR
	  type rather than a one byte TYPE_CODE_INT type.
	* ch-lang.c (chill_language_defn):  Add chill_print_type and
	  chill_val_print.
	* ch-lang.h (chill_print_type, chill_val_print):  Add prototypes.
	**** end-sanitize-chill ****

1 files changed, 33 insertions, 50 deletions

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 73d72e8..be9d6e0 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -55,9 +55,6 @@ dump_msymbols PARAMS ((struct objfile *, FILE *));
 static void 
 dump_objfile PARAMS ((struct objfile *));
 
-static void
-printobjfiles_command PARAMS ((char *, int));
-
 static int
 block_depth PARAMS ((struct block *));
 
@@ -65,19 +62,11 @@ static void
 print_partial_symbol PARAMS ((struct partial_symbol *, int, char *, FILE *));
 
 static void
-printpsyms_command PARAMS ((char *, int));
-
-static void
 print_symbol PARAMS ((struct symbol *, int, FILE *));
 
 static void
-printsyms_command PARAMS ((char *, int));
-
-static void
 free_symtab_block PARAMS ((struct objfile *, struct block *));
 
-static void
-printmsyms_command PARAMS ((char *, int));
 
 /* Free a struct block <- B and all the symbols defined in that block.  */
 
@@ -152,6 +141,8 @@ free_symtab (s)
   mfree (s -> objfile -> md, (PTR) s);
 }
 
+#if MAINTENANCE_CMDS
+
 static void 
 dump_objfile (objfile)
      struct objfile *objfile;
@@ -267,11 +258,12 @@ dump_psymtab (objfile, psymtab, outfile)
 
   /* FIXME, we need to be able to print the relocation stuff. */
   /* This prints some garbage for anything but stabs right now.  FIXME.  */
-  fprintf_filtered (outfile, "  Relocate symbols by 0x%x, 0x%x, 0x%x, 0x%x.\n",
-		    ANOFFSET (psymtab->section_offsets, 0),
-		    ANOFFSET (psymtab->section_offsets, 1),
-		    ANOFFSET (psymtab->section_offsets, 2),
-		    ANOFFSET (psymtab->section_offsets, 3));
+  if (psymtab->section_offsets)
+    fprintf_filtered (outfile, "  Relocate symbols by 0x%x, 0x%x, 0x%x, 0x%x.\n",
+		      ANOFFSET (psymtab->section_offsets, 0),
+		      ANOFFSET (psymtab->section_offsets, 1),
+		      ANOFFSET (psymtab->section_offsets, 2),
+		      ANOFFSET (psymtab->section_offsets, 3));
 
   fprintf_filtered (outfile, "  Symbols cover text addresses 0x%x-0x%x\n",
 		    psymtab -> textlow, psymtab -> texthigh);
@@ -334,6 +326,8 @@ dump_symtab (objfile, symtab, outfile)
 	fprintf (outfile, " (under 0x%x)", (unsigned int) BLOCK_SUPERBLOCK (b));
       if (BLOCK_FUNCTION (b))
 	fprintf (outfile, " %s", SYMBOL_NAME (BLOCK_FUNCTION (b)));
+      if (BLOCK_GCC_COMPILED(b))
+	fprintf (outfile, " gcc%d compiled", BLOCK_GCC_COMPILED(b));
       fputc ('\n', outfile);
       blen = BLOCK_NSYMS (b);
       for (j = 0; j < blen; j++)
@@ -344,8 +338,8 @@ dump_symtab (objfile, symtab, outfile)
   fprintf (outfile, "\n");
 }
 
-static void
-printsyms_command (args, from_tty)
+void
+maintenance_print_symbols (args, from_tty)
      char *args;
      int from_tty;
 {
@@ -361,7 +355,7 @@ printsyms_command (args, from_tty)
 
   if (args == NULL)
     {
-      error ("printsyms takes an output file name and optional symbol file name");
+      error ("print-symbols takes an output file name and optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
@@ -412,7 +406,7 @@ print_symbol (symbol, depth, outfile)
     {
       if (TYPE_NAME (SYMBOL_TYPE (symbol)))
 	{
-	  type_print_1 (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
 	}
       else
 	{
@@ -422,7 +416,7 @@ print_symbol (symbol, depth, outfile)
 		: (TYPE_CODE (SYMBOL_TYPE (symbol)) == TYPE_CODE_STRUCT
 		   ? "struct" : "union")),
 	       SYMBOL_NAME (symbol));
-	  type_print_1 (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), "", outfile, 1, depth);
 	}
       fprintf (outfile, ";\n");
     }
@@ -433,9 +427,9 @@ print_symbol (symbol, depth, outfile)
       if (SYMBOL_TYPE (symbol))
 	{
 	  /* Print details of types, except for enums where it's clutter.  */
-	  type_print_1 (SYMBOL_TYPE (symbol), SYMBOL_NAME (symbol), outfile,
-			TYPE_CODE (SYMBOL_TYPE (symbol)) != TYPE_CODE_ENUM,
-			depth);
+	  LA_PRINT_TYPE (SYMBOL_TYPE (symbol), SYMBOL_NAME (symbol), outfile,
+			 TYPE_CODE (SYMBOL_TYPE (symbol)) != TYPE_CODE_ENUM,
+			 depth);
 	  fprintf (outfile, "; ");
 	}
       else
@@ -533,8 +527,8 @@ print_symbol (symbol, depth, outfile)
   fprintf (outfile, "\n");
 }
 
-static void
-printpsyms_command (args, from_tty)
+void
+maintenance_print_psymbols (args, from_tty)
      char *args;
      int from_tty;
 {
@@ -550,7 +544,7 @@ printpsyms_command (args, from_tty)
 
   if (args == NULL)
     {
-      error ("printpsyms takes an output file name and optional symbol file name");
+      error ("print-psymbols takes an output file name and optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
@@ -665,8 +659,8 @@ print_partial_symbol (p, count, what, outfile)
     }
 }
 
-static void
-printmsyms_command (args, from_tty)
+void
+maintenance_print_msymbols (args, from_tty)
      char *args;
      int from_tty;
 {
@@ -681,7 +675,7 @@ printmsyms_command (args, from_tty)
 
   if (args == NULL)
     {
-      error ("printmsyms takes an output file name and optional symbol file name");
+      error ("print-msymbols takes an output file name and optional symbol file name");
     }
   else if ((argv = buildargv (args)) == NULL)
     {
@@ -716,8 +710,8 @@ printmsyms_command (args, from_tty)
   do_cleanups (cleanups);
 }
 
-static void
-printobjfiles_command (ignore, from_tty)
+void
+maintenance_print_objfiles (ignore, from_tty)
      char *ignore;
      int from_tty;
 {
@@ -730,6 +724,7 @@ printobjfiles_command (ignore, from_tty)
     dump_objfile (objfile);
   immediate_quit--;
 }
+
 
 /* Return the nexting depth of a block within other blocks in its symtab.  */
 
@@ -738,10 +733,15 @@ block_depth (block)
      struct block *block;
 {
   register int i = 0;
-  while (block = BLOCK_SUPERBLOCK (block)) i++;
+  while ((block = BLOCK_SUPERBLOCK (block)) != NULL) 
+    {
+      i++;
+    }
   return i;
 }
 
+#endif	/* MAINTENANCE_CMDS */
+
 
 /* Increase the space allocated for LISTP, which is probably
    global_psymbol_list or static_psymbol_list. This space will eventually
@@ -829,20 +829,3 @@ add_psymbol_addr_to_list (name, namelength, namespace, class, listp, psymval)
 }
 
 #endif /* DEBUG */
-
-void
-_initialize_symmisc ()
-{
-  add_com ("printmsyms", class_obscure, printmsyms_command,
-	   "Print dump of current minimal symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's symbols.");
-  add_com ("printpsyms", class_obscure, printpsyms_command,
-	  "Print dump of current partial symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's partial symbols.");
-  add_com ("printsyms", class_obscure, printsyms_command,
-	   "Print dump of current symbol definitions to file OUTFILE.\n\
-If a SOURCE file is specified, dump only that file's symbols.");
-  add_com ("printobjfiles", class_obscure, printobjfiles_command,
-	   "Print dump of current object file definitions.");
-}
-