From: kevinb <kevinb>
Date: Tue, 13 Mar 2007 16:29:14 +0000 (+0000)
Subject: Eliminate use of `deprecated_selected_frame'.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=be0e75e19285171f0d87ec7aa62aaeebc36c5207;p=pf3gnuchains%2Fpf3gnuchains3x.git

Eliminate use of `deprecated_selected_frame'.
---

diff --git a/gdb/gdbtk/ChangeLog b/gdb/gdbtk/ChangeLog
index eeecaff2bf..3ea690166b 100644
--- a/gdb/gdbtk/ChangeLog
+++ b/gdb/gdbtk/ChangeLog
@@ -1,3 +1,12 @@
+2007-03-13  Kevin Buettner  <kevinb@redhat.com>
+
+	* generic/gdbtk-cmds.c (gdb_loc): Eliminate use of
+	`deprecated_selected_frame'.
+	* generic/gdbtk-register.c (register_changed_p): Likewise.
+	* generic/gdbtk-stack.c (gdb_block_vars, gdb_get_blocks)
+	(gdb_get_vars_command, gdb_selected_block, gdb_selected_frame):
+	Likewise.
+
 2006-11-30  Keith Seitz  <keiths@redhat.com>
 
 	insight/293:
diff --git a/gdb/gdbtk/generic/gdbtk-cmds.c b/gdb/gdbtk/generic/gdbtk-cmds.c
index ab989b7908..75cc5a348d 100644
--- a/gdb/gdbtk/generic/gdbtk-cmds.c
+++ b/gdb/gdbtk/generic/gdbtk-cmds.c
@@ -2129,23 +2129,29 @@ gdb_loc (ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST obj
           pc = entry_point_address ();
           sal = find_pc_line (pc, 0);
         }  
-      else if (deprecated_selected_frame
-	       && (get_frame_pc (deprecated_selected_frame) != read_pc ()))
-        {
-          /* Note - this next line is not correct on all architectures.
-	     For a graphical debugger we really want to highlight the 
-	     assembly line that called the next function on the stack.
-	     Many architectures have the next instruction saved as the
-	     pc on the stack, so what happens is the next instruction 
-	     is highlighted. FIXME */
-	  pc = get_frame_pc (deprecated_selected_frame);
-	  find_frame_sal (deprecated_selected_frame, &sal);
-	}
       else
-        {
-          pc = read_pc ();
-          sal = find_pc_line (pc, 0);
-        }
+	{
+	  struct frame_info *frame;
+
+	  frame = get_selected_frame (NULL);
+
+	  if (get_frame_pc (frame) != read_pc ())
+	    {
+	      /* Note - this next line is not correct on all architectures.
+		 For a graphical debugger we really want to highlight the 
+		 assembly line that called the next function on the stack.
+		 Many architectures have the next instruction saved as the
+		 pc on the stack, so what happens is the next instruction 
+		 is highlighted. FIXME */
+	      pc = get_frame_pc (frame);
+	      find_frame_sal (frame, &sal);
+	    }
+	  else
+	    {
+	      pc = read_pc ();
+	      sal = find_pc_line (pc, 0);
+	    }
+	}
     }
   else if (objc == 2)
     {
diff --git a/gdb/gdbtk/generic/gdbtk-register.c b/gdb/gdbtk/generic/gdbtk-register.c
index 57351e074d..6a0dd48b40 100644
--- a/gdb/gdbtk/generic/gdbtk-register.c
+++ b/gdb/gdbtk/generic/gdbtk-register.c
@@ -429,8 +429,8 @@ register_changed_p (int regnum, void *argp)
 {
   char raw_buffer[MAX_REGISTER_SIZE];
 
-  if (deprecated_selected_frame == NULL
-      || !frame_register_read (deprecated_selected_frame, regnum, raw_buffer))
+  if (!target_has_registers
+      || !frame_register_read (get_selected_frame (NULL), regnum, raw_buffer))
     return;
 
   if (memcmp (&old_regs[regnum * MAX_REGISTER_SIZE], raw_buffer,
diff --git a/gdb/gdbtk/generic/gdbtk-stack.c b/gdb/gdbtk/generic/gdbtk-stack.c
index 4c2c00e1e0..4bf1a0ac6d 100644
--- a/gdb/gdbtk/generic/gdbtk-stack.c
+++ b/gdb/gdbtk/generic/gdbtk-stack.c
@@ -97,13 +97,13 @@ gdb_block_vars (ClientData clientData, Tcl_Interp *interp,
     }
 
   Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
-  if (deprecated_selected_frame == NULL)
+  if (!target_has_registers)
     return TCL_OK;
 
   start = string_to_core_addr (Tcl_GetStringFromObj (objv[1], NULL));
   end   = string_to_core_addr (Tcl_GetStringFromObj (objv[2], NULL));
   
-  block = get_frame_block (deprecated_selected_frame, 0);
+  block = get_frame_block (get_selected_frame (NULL), 0);
 
   while (block != 0)
     {
@@ -168,10 +168,12 @@ gdb_get_blocks (ClientData clientData, Tcl_Interp *interp,
 
   Tcl_SetListObj (result_ptr->obj_ptr, 0, NULL);
   
-  if (deprecated_selected_frame != NULL)
+  if (target_has_registers)
     {
-      block = get_frame_block (deprecated_selected_frame, 0);
-      pc = get_frame_pc (deprecated_selected_frame);
+      struct frame_info *frame = get_selected_frame (NULL);
+
+      block = get_frame_block (frame, 0);
+      pc = get_frame_pc (frame);
       while (block != 0)
 	{
 	  junk = 0;
@@ -317,10 +319,10 @@ gdb_get_vars_command (ClientData clientData, Tcl_Interp *interp,
   else
     {
       /* Specified currently selected frame */
-      if (deprecated_selected_frame == NULL)
+      if (!target_has_registers)
 	return TCL_OK;
 
-      block = get_frame_block (deprecated_selected_frame, 0);
+      block = get_frame_block (get_selected_frame (NULL), 0);
     }
 
   while (block != 0)
@@ -387,7 +389,7 @@ gdb_selected_block (ClientData clientData, Tcl_Interp *interp,
   char *start = NULL;
   char *end   = NULL;
 
-  if (deprecated_selected_frame == NULL)
+  if (!target_has_registers)
     {
       xasprintf (&start, "%s", "");
       xasprintf (&end, "%s", "");
@@ -395,7 +397,7 @@ gdb_selected_block (ClientData clientData, Tcl_Interp *interp,
   else
     {
       struct block *block;
-      block = get_frame_block (deprecated_selected_frame, 0);
+      block = get_frame_block (get_selected_frame (NULL), 0);
       xasprintf (&start, "0x%s", paddr_nz (BLOCK_START (block)));
       xasprintf (&end, "0x%s", paddr_nz (BLOCK_END (block)));
     }
@@ -427,13 +429,13 @@ gdb_selected_frame (ClientData clientData, Tcl_Interp *interp,
 {
   char *frame;
 
-  if (deprecated_selected_frame == NULL)
+  if (!target_has_registers)
     xasprintf (&frame, "%s","");
   else
     /* FIXME: cagney/2002-11-19: This should be using get_frame_id()
        to identify the frame and *NOT* get_frame_base().  */
     xasprintf (&frame, "0x%s",
-	       paddr_nz (get_frame_base (deprecated_selected_frame)));
+	       paddr_nz (get_frame_base (get_selected_frame (NULL))));
 
   Tcl_SetStringObj (result_ptr->obj_ptr, frame, -1);