Re: RFC (gdb/mi): -stack-list-locals + REVISED PATCH

[Nick Roberts <nick@nick.uklinux.net>]

This patch:

1) Follows Jim Ingham's advice of using check_typedef to guard against the
   case of TYPE_CODE_TYPEDEF.

2) Avoids a segmentation fault if -stack-list-locals is invoked before the
   inferior has started execution.

3) Still introduces "-stack-list-locals 2". I'm not sure how to simplify this
   as any change must presumably be beackward compatible. I don't think using
   different numbers to mean different things is a problem here as mi commands
   are not intended for the user and so don't need to be remembered by
   him/her.


    Nick                                         http://www.nick.uklinux.net



*** mi-cmd-stack.c.~1.19.~	2003-06-12 23:29:37.000000000 +0100
--- mi-cmd-stack.c	2003-12-09 02:12:45.000000000 +0000
***************
*** 140,145 ****
--- 140,148 ----
    if (argc != 1)
      error ("mi_cmd_stack_list_locals: Usage: PRINT_VALUES");
  
+   if (!deprecated_selected_frame)
+     error ("No frame selected.");
+ 
    list_args_or_locals (1, atoi (argv[0]), deprecated_selected_frame);
    return MI_CMD_DONE;
  }
***************
*** 273,288 ****
  		  make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
  	      ui_out_field_string (uiout, "name", DEPRECATED_SYMBOL_NAME (sym));
  
! 	      if (values)
! 		{
! 		  struct symbol *sym2;
! 		  if (!locals)
! 		    sym2 = lookup_symbol (DEPRECATED_SYMBOL_NAME (sym),
! 					  block, VAR_DOMAIN,
! 					  (int *) NULL,
! 					  (struct symtab **) NULL);
! 		  else
  		    sym2 = sym;
  		  print_variable_value (sym2, fi, stb->stream);
  		  ui_out_field_stream (uiout, "value", stb);
  		  do_cleanups (cleanup_tuple);
--- 276,304 ----
  		  make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
  	      ui_out_field_string (uiout, "name", DEPRECATED_SYMBOL_NAME (sym));
  
! 	      struct symbol *sym2;
! 	      if (!locals)
! 		sym2 = lookup_symbol (DEPRECATED_SYMBOL_NAME (sym),
! 				      block, VAR_DOMAIN,
! 				      (int *) NULL,
! 				      (struct symtab **) NULL);
! 	      else
  		    sym2 = sym;
+ 	      if (values == 2)
+ 		{
+ 		  type_print (sym2->type, "", stb->stream, -1);
+ 		  ui_out_field_stream (uiout, "type", stb);
+ 		  if (TYPE_CODE (check_typedef (sym2->type)) != TYPE_CODE_ARRAY
+ 		      &&
+ 		      TYPE_CODE (check_typedef (sym2->type)) != TYPE_CODE_STRUCT)
+ 		    {
+ 		      print_variable_value (sym2, fi, stb->stream);
+ 		      ui_out_field_stream (uiout, "value", stb);
+ 		    }
+ 		  do_cleanups (cleanup_tuple);
+ 		}
+ 	      else if (values)
+ 		{
  		  print_variable_value (sym2, fi, stb->stream);
  		  ui_out_field_stream (uiout, "value", stb);
  		  do_cleanups (cleanup_tuple);