yann@96: 2004-10-11
yann@96: 
yann@96: This patch is not submitted.  Many of these functions should be passing
yann@96: a frame around rather than calling get_selected_frame, but at least it
yann@96: is an improvement over deprecated_selected_frame.
yann@96: 
yann@96: Index: gdb-6.3/gdb/breakpoint.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/breakpoint.c	2004-10-08 13:30:46.000000000 -0400
yann@96: +++ gdb-6.3/gdb/breakpoint.c	2004-11-09 22:55:11.231620957 -0500
yann@96: @@ -922,7 +922,7 @@ insert_bp_location (struct bp_location *
yann@96:        /* FIXME drow/2003-09-09: It would be nice if evaluate_expression
yann@96:  	 took a frame parameter, so that we didn't have to change the
yann@96:  	 selected frame.  */
yann@96: -      saved_frame_id = get_frame_id (deprecated_selected_frame);
yann@96: +      saved_frame_id = get_frame_id (get_selected_frame ());
yann@96:  
yann@96:        /* Determine if the watchpoint is within scope.  */
yann@96:        if (bpt->owner->exp_valid_block == NULL)
yann@96: @@ -5464,14 +5464,9 @@ break_at_finish_at_depth_command_1 (char
yann@96:  
yann@96:        if (default_breakpoint_valid)
yann@96:  	{
yann@96: -	  if (deprecated_selected_frame)
yann@96: -	    {
yann@96: -	      selected_pc = get_frame_pc (deprecated_selected_frame);
yann@96: -	      if (arg)
yann@96: -		if_arg = 1;
yann@96: -	    }
yann@96: -	  else
yann@96: -	    error ("No selected frame.");
yann@96: +	  selected_pc = get_frame_pc (get_selected_frame ());
yann@96: +	  if (arg)
yann@96: +	    if_arg = 1;
yann@96:  	}
yann@96:        else
yann@96:  	error ("No default breakpoint address now.");
yann@96: @@ -5542,15 +5537,10 @@ break_at_finish_command_1 (char *arg, in
yann@96:      {
yann@96:        if (default_breakpoint_valid)
yann@96:  	{
yann@96: -	  if (deprecated_selected_frame)
yann@96: -	    {
yann@96: -	      addr_string = xstrprintf ("*0x%s",
yann@96: -					paddr_nz (get_frame_pc (deprecated_selected_frame)));
yann@96: -	      if (arg)
yann@96: -		if_arg = 1;
yann@96: -	    }
yann@96: -	  else
yann@96: -	    error ("No selected frame.");
yann@96: +	  addr_string = xstrprintf ("*0x%s",
yann@96: +				    paddr_nz (get_frame_pc (get_selected_frame ())));
yann@96: +	  if (arg)
yann@96: +	    if_arg = 1;
yann@96:  	}
yann@96:        else
yann@96:  	error ("No default breakpoint address now.");
yann@96: @@ -6082,7 +6072,7 @@ until_break_command (char *arg, int from
yann@96:  {
yann@96:    struct symtabs_and_lines sals;
yann@96:    struct symtab_and_line sal;
yann@96: -  struct frame_info *prev_frame = get_prev_frame (deprecated_selected_frame);
yann@96: +  struct frame_info *prev_frame = get_prev_frame (get_selected_frame ());
yann@96:    struct breakpoint *breakpoint;
yann@96:    struct cleanup *old_chain;
yann@96:    struct continuation_arg *arg1;
yann@96: @@ -6119,7 +6109,7 @@ until_break_command (char *arg, int from
yann@96:      /* Otherwise, specify the current frame, because we want to stop only
yann@96:         at the very same frame.  */
yann@96:      breakpoint = set_momentary_breakpoint (sal,
yann@96: -					   get_frame_id (deprecated_selected_frame),
yann@96: +					   get_frame_id (get_selected_frame ()),
yann@96:  					   bp_until);
yann@96:  
yann@96:    if (!target_can_async_p ())
yann@96: Index: gdb-6.3/gdb/cli/cli-cmds.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/cli/cli-cmds.c	2004-09-11 06:24:53.000000000 -0400
yann@96: +++ gdb-6.3/gdb/cli/cli-cmds.c	2004-11-09 22:51:07.323246218 -0500
yann@96: @@ -845,10 +845,7 @@ disassemble_command (char *arg, int from
yann@96:    name = NULL;
yann@96:    if (!arg)
yann@96:      {
yann@96: -      if (!deprecated_selected_frame)
yann@96: -	error ("No frame selected.\n");
yann@96: -
yann@96: -      pc = get_frame_pc (deprecated_selected_frame);
yann@96: +      pc = get_frame_pc (get_selected_frame ());
yann@96:        if (find_pc_partial_function (pc, &name, &low, &high) == 0)
yann@96:  	error ("No function contains program counter for selected frame.\n");
yann@96:  #if defined(TUI)
yann@96: Index: gdb-6.3/gdb/f-valprint.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/f-valprint.c	2003-10-14 02:51:14.000000000 -0400
yann@96: +++ gdb-6.3/gdb/f-valprint.c	2004-11-09 22:51:07.326245632 -0500
yann@96: @@ -76,7 +76,7 @@ f77_get_dynamic_lowerbound (struct type 
yann@96:    switch (TYPE_ARRAY_LOWER_BOUND_TYPE (type))
yann@96:      {
yann@96:      case BOUND_BY_VALUE_ON_STACK:
yann@96: -      current_frame_addr = get_frame_base (deprecated_selected_frame);
yann@96: +      current_frame_addr = get_frame_base (get_selected_frame ());
yann@96:        if (current_frame_addr > 0)
yann@96:  	{
yann@96:  	  *lower_bound =
yann@96: @@ -100,7 +100,7 @@ f77_get_dynamic_lowerbound (struct type 
yann@96:        break;
yann@96:  
yann@96:      case BOUND_BY_REF_ON_STACK:
yann@96: -      current_frame_addr = get_frame_base (deprecated_selected_frame);
yann@96: +      current_frame_addr = get_frame_base (get_selected_frame ());
yann@96:        if (current_frame_addr > 0)
yann@96:  	{
yann@96:  	  ptr_to_lower_bound =
yann@96: @@ -134,7 +134,7 @@ f77_get_dynamic_upperbound (struct type 
yann@96:    switch (TYPE_ARRAY_UPPER_BOUND_TYPE (type))
yann@96:      {
yann@96:      case BOUND_BY_VALUE_ON_STACK:
yann@96: -      current_frame_addr = get_frame_base (deprecated_selected_frame);
yann@96: +      current_frame_addr = get_frame_base (get_selected_frame ());
yann@96:        if (current_frame_addr > 0)
yann@96:  	{
yann@96:  	  *upper_bound =
yann@96: @@ -163,7 +163,7 @@ f77_get_dynamic_upperbound (struct type 
yann@96:        break;
yann@96:  
yann@96:      case BOUND_BY_REF_ON_STACK:
yann@96: -      current_frame_addr = get_frame_base (deprecated_selected_frame);
yann@96: +      current_frame_addr = get_frame_base (get_selected_frame ());
yann@96:        if (current_frame_addr > 0)
yann@96:  	{
yann@96:  	  ptr_to_upper_bound =
yann@96: @@ -630,10 +630,7 @@ info_common_command (char *comname, int 
yann@96:       first make sure that it is visible and if so, let 
yann@96:       us display its contents */
yann@96:  
yann@96: -  fi = deprecated_selected_frame;
yann@96: -
yann@96: -  if (fi == NULL)
yann@96: -    error ("No frame selected");
yann@96: +  fi = get_selected_frame ();
yann@96:  
yann@96:    /* The following is generally ripped off from stack.c's routine 
yann@96:       print_frame_info() */
yann@96: @@ -722,10 +719,7 @@ there_is_a_visible_common_named (char *c
yann@96:    if (comname == NULL)
yann@96:      error ("Cannot deal with NULL common name!");
yann@96:  
yann@96: -  fi = deprecated_selected_frame;
yann@96: -
yann@96: -  if (fi == NULL)
yann@96: -    error ("No frame selected");
yann@96: +  fi = get_selected_frame ();
yann@96:  
yann@96:    /* The following is generally ripped off from stack.c's routine 
yann@96:       print_frame_info() */
yann@96: Index: gdb-6.3/gdb/infcmd.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/infcmd.c	2004-09-13 14:26:28.000000000 -0400
yann@96: +++ gdb-6.3/gdb/infcmd.c	2004-11-09 22:57:37.274099559 -0500
yann@96: @@ -1214,10 +1214,8 @@ finish_command (char *arg, int from_tty)
yann@96:      error ("The \"finish\" command does not take any arguments.");
yann@96:    if (!target_has_execution)
yann@96:      error ("The program is not running.");
yann@96: -  if (deprecated_selected_frame == NULL)
yann@96: -    error ("No selected frame.");
yann@96:  
yann@96: -  frame = get_prev_frame (deprecated_selected_frame);
yann@96: +  frame = get_prev_frame (get_selected_frame ());
yann@96:    if (frame == 0)
yann@96:      error ("\"finish\" not meaningful in the outermost frame.");
yann@96:  
yann@96: @@ -1235,7 +1233,7 @@ finish_command (char *arg, int from_tty)
yann@96:  
yann@96:    /* Find the function we will return from.  */
yann@96:  
yann@96: -  function = find_pc_function (get_frame_pc (deprecated_selected_frame));
yann@96: +  function = find_pc_function (get_frame_pc (get_selected_frame ()));
yann@96:  
yann@96:    /* Print info on the selected frame, including level number but not
yann@96:       source.  */
yann@96: @@ -1600,13 +1598,11 @@ registers_info (char *addr_exp, int fpre
yann@96:  
yann@96:    if (!target_has_registers)
yann@96:      error ("The program has no registers now.");
yann@96: -  if (deprecated_selected_frame == NULL)
yann@96: -    error ("No selected frame.");
yann@96:  
yann@96:    if (!addr_exp)
yann@96:      {
yann@96:        gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
yann@96: -				    deprecated_selected_frame, -1, fpregs);
yann@96: +				    get_selected_frame (), -1, fpregs);
yann@96:        return;
yann@96:      }
yann@96:  
yann@96: @@ -1644,7 +1640,7 @@ registers_info (char *addr_exp, int fpre
yann@96:  	if (regnum >= 0)
yann@96:  	  {
yann@96:  	    gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
yann@96: -					  deprecated_selected_frame, regnum, fpregs);
yann@96: +					  get_selected_frame (), regnum, fpregs);
yann@96:  	    continue;
yann@96:  	  }
yann@96:        }
yann@96: @@ -1658,7 +1654,7 @@ registers_info (char *addr_exp, int fpre
yann@96:  	    && regnum < NUM_REGS + NUM_PSEUDO_REGS)
yann@96:  	  {
yann@96:  	    gdbarch_print_registers_info (current_gdbarch, gdb_stdout,
yann@96: -					  deprecated_selected_frame, regnum, fpregs);
yann@96: +					  get_selected_frame (), regnum, fpregs);
yann@96:  	    continue;
yann@96:  	  }
yann@96:        }
yann@96: @@ -1684,7 +1680,7 @@ registers_info (char *addr_exp, int fpre
yann@96:  		if (gdbarch_register_reggroup_p (current_gdbarch, regnum,
yann@96:  						 group))
yann@96:  		  gdbarch_print_registers_info (current_gdbarch,
yann@96: -						gdb_stdout, deprecated_selected_frame,
yann@96: +						gdb_stdout, get_selected_frame (),
yann@96:  						regnum, fpregs);
yann@96:  	      }
yann@96:  	    continue;
yann@96: @@ -1714,8 +1710,6 @@ print_vector_info (struct gdbarch *gdbar
yann@96:  {
yann@96:    if (!target_has_registers)
yann@96:      error ("The program has no registers now.");
yann@96: -  if (deprecated_selected_frame == NULL)
yann@96: -    error ("No selected frame.");
yann@96:  
yann@96:    if (gdbarch_print_vector_info_p (gdbarch))
yann@96:      gdbarch_print_vector_info (gdbarch, file, frame, args);
yann@96: @@ -1740,7 +1734,7 @@ print_vector_info (struct gdbarch *gdbar
yann@96:  static void
yann@96:  vector_info (char *args, int from_tty)
yann@96:  {
yann@96: -  print_vector_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
yann@96: +  print_vector_info (current_gdbarch, gdb_stdout, get_selected_frame (), args);
yann@96:  }
yann@96:  
yann@96:  
yann@96: @@ -1910,8 +1904,6 @@ print_float_info (struct gdbarch *gdbarc
yann@96:  {
yann@96:    if (!target_has_registers)
yann@96:      error ("The program has no registers now.");
yann@96: -  if (deprecated_selected_frame == NULL)
yann@96: -    error ("No selected frame.");
yann@96:  
yann@96:    if (gdbarch_print_float_info_p (gdbarch))
yann@96:      gdbarch_print_float_info (gdbarch, file, frame, args);
yann@96: @@ -1937,7 +1929,7 @@ No floating-point info available for thi
yann@96:  static void
yann@96:  float_info (char *args, int from_tty)
yann@96:  {
yann@96: -  print_float_info (current_gdbarch, gdb_stdout, deprecated_selected_frame, args);
yann@96: +  print_float_info (current_gdbarch, gdb_stdout, get_selected_frame (), args);
yann@96:  }
yann@96:  
yann@96:  static void
yann@96: Index: gdb-6.3/gdb/inflow.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/inflow.c	2004-08-11 05:00:57.000000000 -0400
yann@96: +++ gdb-6.3/gdb/inflow.c	2004-11-09 22:58:37.488338883 -0500
yann@96: @@ -591,10 +591,7 @@ kill_command (char *arg, int from_tty)
yann@96:    if (target_has_stack)
yann@96:      {
yann@96:        printf_filtered ("In %s,\n", target_longname);
yann@96: -      if (deprecated_selected_frame == NULL)
yann@96: -	fputs_filtered ("No selected stack frame.\n", gdb_stdout);
yann@96: -      else
yann@96: -	print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
yann@96: +      print_stack_frame (get_selected_frame (), 1, SRC_AND_LOC);
yann@96:      }
yann@96:    bfd_cache_close_all ();
yann@96:  }
yann@96: Index: gdb-6.3/gdb/infrun.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/infrun.c	2004-09-27 13:58:08.000000000 -0400
yann@96: +++ gdb-6.3/gdb/infrun.c	2004-11-09 22:51:07.351240752 -0500
yann@96: @@ -3485,7 +3485,7 @@ save_inferior_status (int restore_stack_
yann@96:  
yann@96:    inf_status->registers = regcache_dup (current_regcache);
yann@96:  
yann@96: -  inf_status->selected_frame_id = get_frame_id (deprecated_selected_frame);
yann@96: +  inf_status->selected_frame_id = get_frame_id (get_selected_frame ());
yann@96:    return inf_status;
yann@96:  }
yann@96:  
yann@96: Index: gdb-6.3/gdb/mi/mi-main.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/mi/mi-main.c	2004-09-12 11:00:42.000000000 -0400
yann@96: +++ gdb-6.3/gdb/mi/mi-main.c	2004-11-09 22:53:29.998389013 -0500
yann@96: @@ -388,7 +388,7 @@ register_changed_p (int regnum)
yann@96:  {
yann@96:    char raw_buffer[MAX_REGISTER_SIZE];
yann@96:  
yann@96: -  if (! frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
yann@96: +  if (! frame_register_read (get_selected_frame (), regnum, raw_buffer))
yann@96:      return -1;
yann@96:  
yann@96:    if (memcmp (&old_regs[DEPRECATED_REGISTER_BYTE (regnum)], raw_buffer,
yann@96: @@ -509,7 +509,7 @@ get_register (int regnum, int format)
yann@96:    if (format == 'N')
yann@96:      format = 0;
yann@96:  
yann@96: -  frame_register (deprecated_selected_frame, regnum, &optim, &lval, &addr,
yann@96: +  frame_register (get_selected_frame (), regnum, &optim, &lval, &addr,
yann@96:  		  &realnum, buffer);
yann@96:  
yann@96:    if (optim)
yann@96: Index: gdb-6.3/gdb/mn10300-tdep.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/mn10300-tdep.c	2004-08-02 22:02:22.000000000 -0400
yann@96: +++ gdb-6.3/gdb/mn10300-tdep.c	2004-11-09 22:51:07.356239776 -0500
yann@96: @@ -1154,7 +1154,7 @@ mn10300_print_register (const char *name
yann@96:      printf_filtered ("%s: ", name);
yann@96:  
yann@96:    /* Get the data */
yann@96: -  if (!frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
yann@96: +  if (!frame_register_read (get_selected_frame (), regnum, raw_buffer))
yann@96:      {
yann@96:        printf_filtered ("[invalid]");
yann@96:        return;
yann@96: Index: gdb-6.3/gdb/stack.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/stack.c	2004-08-02 20:57:26.000000000 -0400
yann@96: +++ gdb-6.3/gdb/stack.c	2004-11-09 22:51:07.361238800 -0500
yann@96: @@ -758,9 +758,7 @@ parse_frame_specification (char *frame_e
yann@96:    switch (numargs)
yann@96:      {
yann@96:      case 0:
yann@96: -      if (deprecated_selected_frame == NULL)
yann@96: -	error ("No selected frame.");
yann@96: -      return deprecated_selected_frame;
yann@96: +      return get_selected_frame ();
yann@96:        /* NOTREACHED */
yann@96:      case 1:
yann@96:        {
yann@96: @@ -902,10 +900,10 @@ frame_info (char *addr_exp, int from_tty
yann@96:      }
yann@96:    calling_frame_info = get_prev_frame (fi);
yann@96:  
yann@96: -  if (!addr_exp && frame_relative_level (deprecated_selected_frame) >= 0)
yann@96: +  if (!addr_exp && frame_relative_level (get_selected_frame ()) >= 0)
yann@96:      {
yann@96:        printf_filtered ("Stack level %d, frame at ",
yann@96: -		       frame_relative_level (deprecated_selected_frame));
yann@96: +		       frame_relative_level (get_selected_frame ()));
yann@96:        print_address_numeric (get_frame_base (fi), 1, gdb_stdout);
yann@96:        printf_filtered (":\n");
yann@96:      }
yann@96: @@ -1445,9 +1443,7 @@ print_frame_label_vars (struct frame_inf
yann@96:  void
yann@96:  locals_info (char *args, int from_tty)
yann@96:  {
yann@96: -  if (!deprecated_selected_frame)
yann@96: -    error ("No frame selected.");
yann@96: -  print_frame_local_vars (deprecated_selected_frame, 0, gdb_stdout);
yann@96: +  print_frame_local_vars (get_selected_frame (), 0, gdb_stdout);
yann@96:  }
yann@96:  
yann@96:  static void
yann@96: @@ -1470,7 +1466,7 @@ catch_info (char *ignore, int from_tty)
yann@96:        if (!deprecated_selected_frame)
yann@96:  	error ("No frame selected.");
yann@96:  
yann@96: -      print_frame_label_vars (deprecated_selected_frame, 0, gdb_stdout);
yann@96: +      print_frame_label_vars (get_selected_frame (), 0, gdb_stdout);
yann@96:      }
yann@96:  }
yann@96:  
yann@96: @@ -1537,9 +1533,7 @@ print_frame_arg_vars (struct frame_info 
yann@96:  void
yann@96:  args_info (char *ignore, int from_tty)
yann@96:  {
yann@96: -  if (!deprecated_selected_frame)
yann@96: -    error ("No frame selected.");
yann@96: -  print_frame_arg_vars (deprecated_selected_frame, gdb_stdout);
yann@96: +  print_frame_arg_vars (get_selected_frame (), gdb_stdout);
yann@96:  }
yann@96:  
yann@96:  
yann@96: @@ -1724,7 +1718,7 @@ down_silently_base (char *count_exp)
yann@96:    if (target_has_stack == 0 || deprecated_selected_frame == 0)
yann@96:      error ("No stack.");
yann@96:  
yann@96: -  frame = find_relative_frame (deprecated_selected_frame, &count1);
yann@96: +  frame = find_relative_frame (get_selected_frame (), &count1);
yann@96:    if (count1 != 0 && count_exp == 0)
yann@96:      {
yann@96:  
yann@96: @@ -1944,7 +1938,7 @@ func_command (char *arg, int from_tty)
yann@96:  
yann@96:    if (!found)
yann@96:      printf_filtered ("'%s' not within current stack frame.\n", arg);
yann@96: -  else if (fp != deprecated_selected_frame)
yann@96: +  else if (fp != get_selected_frame ())
yann@96:      select_and_print_frame (fp);
yann@96:  }
yann@96:  
yann@96: @@ -1965,7 +1959,7 @@ get_frame_language (void)
yann@96:           instruction of another function.  So we rely on
yann@96:           get_frame_address_in_block(), it provides us with a PC which is
yann@96:           guaranteed to be inside the frame's code block.  */
yann@96: -      s = find_pc_symtab (get_frame_address_in_block (deprecated_selected_frame));
yann@96: +      s = find_pc_symtab (get_frame_address_in_block (get_selected_frame ()));
yann@96:        if (s)
yann@96:  	flang = s->language;
yann@96:        else
yann@96: Index: gdb-6.3/gdb/tui/tui-disasm.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/tui/tui-disasm.c	2004-02-24 20:10:01.000000000 -0500
yann@96: +++ gdb-6.3/gdb/tui/tui-disasm.c	2004-11-09 22:51:07.370237044 -0500
yann@96: @@ -382,7 +382,7 @@ tui_vertical_disassem_scroll (enum tui_s
yann@96:  
yann@96:        content = (tui_win_content) TUI_DISASM_WIN->generic.content;
yann@96:        if (cursal.symtab == (struct symtab *) NULL)
yann@96: -	s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
yann@96: +	s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
yann@96:        else
yann@96:  	s = cursal.symtab;
yann@96:  
yann@96: Index: gdb-6.3/gdb/tui/tui-source.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/tui/tui-source.c	2004-02-16 16:05:09.000000000 -0500
yann@96: +++ gdb-6.3/gdb/tui/tui-source.c	2004-11-09 22:51:07.370237044 -0500
yann@96: @@ -326,7 +326,7 @@ tui_vertical_source_scroll (enum tui_scr
yann@96:        struct symtab_and_line cursal = get_current_source_symtab_and_line ();
yann@96:  
yann@96:        if (cursal.symtab == (struct symtab *) NULL)
yann@96: -	s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
yann@96: +	s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
yann@96:        else
yann@96:  	s = cursal.symtab;
yann@96:  
yann@96: Index: gdb-6.3/gdb/tui/tui-winsource.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/tui/tui-winsource.c	2004-02-16 16:05:09.000000000 -0500
yann@96: +++ gdb-6.3/gdb/tui/tui-winsource.c	2004-11-09 22:51:07.371236848 -0500
yann@96: @@ -311,7 +311,7 @@ tui_horizontal_source_scroll (struct tui
yann@96:        struct symtab_and_line cursal = get_current_source_symtab_and_line ();
yann@96:  
yann@96:        if (cursal.symtab == (struct symtab *) NULL)
yann@96: -	s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
yann@96: +	s = find_pc_symtab (get_frame_pc (get_selected_frame ()));
yann@96:        else
yann@96:  	s = cursal.symtab;
yann@96:  
yann@96: Index: gdb-6.3/gdb/valops.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/valops.c	2004-09-13 23:01:48.000000000 -0400
yann@96: +++ gdb-6.3/gdb/valops.c	2004-11-09 22:51:07.374236263 -0500
yann@96: @@ -2663,15 +2663,10 @@ value_of_local (const char *name, int co
yann@96:    struct block *b;
yann@96:    struct value * ret;
yann@96:  
yann@96: -  if (deprecated_selected_frame == 0)
yann@96: -    {
yann@96: -      if (complain)
yann@96: -	error ("no frame selected");
yann@96: -      else
yann@96: -	return 0;
yann@96: -    }
yann@96: +  if (!complain && deprecated_selected_frame == 0)
yann@96: +    return 0;
yann@96:  
yann@96: -  func = get_frame_function (deprecated_selected_frame);
yann@96: +  func = get_frame_function (get_selected_frame ());
yann@96:    if (!func)
yann@96:      {
yann@96:        if (complain)
yann@96: @@ -2700,7 +2695,7 @@ value_of_local (const char *name, int co
yann@96:  	return NULL;
yann@96:      }
yann@96:  
yann@96: -  ret = read_var_value (sym, deprecated_selected_frame);
yann@96: +  ret = read_var_value (sym, get_selected_frame ());
yann@96:    if (ret == 0 && complain)
yann@96:      error ("`%s' argument unreadable", name);
yann@96:    return ret;
yann@96: Index: gdb-6.3/gdb/varobj.c
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/varobj.c	2004-07-26 10:53:06.000000000 -0400
yann@96: +++ gdb-6.3/gdb/varobj.c	2004-11-09 22:51:07.377235677 -0500
yann@96: @@ -488,7 +488,7 @@ varobj_create (char *objname,
yann@96:        if (fi != NULL)
yann@96:  	{
yann@96:  	  var->root->frame = get_frame_id (fi);
yann@96: -	  old_fi = deprecated_selected_frame;
yann@96: +	  old_fi = get_selected_frame ();
yann@96:  	  select_frame (fi);
yann@96:  	}
yann@96:  
yann@96: Index: gdb-6.3/gdb/testsuite/gdb.base/default.exp
yann@96: ===================================================================
yann@96: --- gdb-6.3.orig/gdb/testsuite/gdb.base/default.exp	2003-03-20 09:45:50.000000000 -0500
yann@96: +++ gdb-6.3/gdb/testsuite/gdb.base/default.exp	2004-11-09 22:51:07.379235287 -0500
yann@96: @@ -167,7 +167,7 @@ gdb_test "disable breakpoints" "" "disab
yann@96:  #test disable display
yann@96:  gdb_test "disable display" "" "disable display"
yann@96:  #test disassemble
yann@96: -gdb_test "disassemble" "No frame selected." "disassemble"
yann@96: +gdb_test "disassemble" "No (frame selected|registers)." "disassemble"
yann@96:  #test display
yann@96:  gdb_test "display" "" "display"
yann@96:  #test do
yann@96: @@ -229,9 +229,9 @@ gdb_expect {
yann@96:  }
yann@96:  
yann@96:  #test frame "f" abbreviation
yann@96: -gdb_test "f" "No stack." "frame \"f\" abbreviation"
yann@96: +gdb_test "f" "No (stack|registers)." "frame \"f\" abbreviation"
yann@96:  #test frame
yann@96: -gdb_test "frame" "No stack." "frame"
yann@96: +gdb_test "frame" "No (stack|registers)." "frame"
yann@96:  #test fg
yann@96:  gdb_test "fg" "The program is not being run." "fg"
yann@96:  # FIXME: fg kills the udi connection
yann@96: @@ -294,9 +294,9 @@ gdb_test "ignore" "Argument required .a 
yann@96:  #test info address
yann@96:  gdb_test "info address" "Argument required." "info address"
yann@96:  #test info all-registers
yann@96: -gdb_test "info all-registers" "The program has no registers now." "info all-registers"
yann@96: +gdb_test "info all-registers" "(The program has no registers now|No registers)." "info all-registers"
yann@96:  #test info args
yann@96: -gdb_test "info args" "No frame selected." "info args"
yann@96: +gdb_test "info args" "No (frame selected|registers)." "info args"
yann@96:  #test info bogus-gdb-command
yann@96:  gdb_test "info bogus-gdb-command" "Undefined info command: \"bogus-gdb-command\".  Try \"help info\".*" "info bogus-gdb-command"
yann@96:  #test info breakpoints
yann@96: @@ -320,11 +320,11 @@ gdb_test "info frame" "No stack.|No sele
yann@96:  #test info files
yann@96:  gdb_test "info files" "" "info files"
yann@96:  #test info float
yann@96: -gdb_test "info float" "The program has no registers now." "info float"
yann@96: +gdb_test "info float" "(The program has no registers now|No registers)." "info float"
yann@96:  #test info functions
yann@96:  gdb_test "info functions" "All defined functions:" "info functions"
yann@96:  #test info locals
yann@96: -gdb_test "info locals" "No frame selected." "info locals"
yann@96: +gdb_test "info locals" "(No frame selected|No registers)." "info locals"
yann@96:  #test info program
yann@96:  gdb_test "info program" "The program being debugged is not being run." "info program"
yann@96:  #test info registers
yann@96: @@ -352,7 +352,7 @@ gdb_test "info types" "All defined types
yann@96:  #test info variables
yann@96:  gdb_test "info variables" "All defined variables:" "info variables"
yann@96:  #test info vector
yann@96: -gdb_test "info vector" "The program has no registers now." "info vector"
yann@96: +gdb_test "info vector" "(The program has no registers now|No registers)." "info vector"
yann@96:  #test info warranty
yann@96:  gdb_test "info warranty" "NO WARRANTY(\[^\r\n\]*\[\r\n\])+  *11.  *BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY(\[^\r\n\]*\[\r\n\])+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN(\[^\r\n\]*\[\r\n\])+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES(\[^\r\n\]*\[\r\n\])+PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED(\[^\r\n\]*\[\r\n\])+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF(\[^\r\n\]*\[\r\n\])+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS(\[^\r\n\]*\[\r\n\])+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE(\[^\r\n\]*\[\r\n\])+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,(\[^\r\n\]*\[\r\n\])+REPAIR OR CORRECTION.(\[^\r\n\]*\[\r\n\])+  *12.  *IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING(\[^\r\n\]*\[\r\n\])+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR(\[^\r\n\]*\[\r\n\])+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,(\[^\r\n\]*\[\r\n\])+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING(\[^\r\n\]*\[\r\n\])+OUT OF THE USE OR INABILITY TO USE THE PROGRAM .INCLUDING BUT NOT LIMITED(\[^\r\n\]*\[\r\n\])+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY(\[^\r\n\]*\[\r\n\])+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER(\[^\r\n\]*\[\r\n\])+PROGRAMS., EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE(\[^\r\n\]*\[\r\n\])+POSSIBILITY OF SUCH DAMAGES.*" "info warranty"
yann@96:  #test info watchpoints