Re: Set the stepping range from the function@PC, not@stop_pc.

[Pedro Alves <pedro@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 344 bytes --]

On Friday 05 December 2008 22:43:13, Pedro Alves wrote:

> Good idea.  I wonder if this I've checked this in then.  There are two
> other instances of read_pc in infcmd.c that could use the same idiom --- I
> guess these calls predate the sentinel frame.

Might as well be consistent.  Tested on x86-64-unknown-linux-gnu.

OK?

-- 
Pedro Alves

[-- Attachment #2: get_frame_pc.diff --]
[-- Type: text/x-diff, Size: 1513 bytes --]

2008-12-05  Pedro Alves  <pedro@codesourcery.com>

	* infcmd.c (until_next_command, finish_backward): Use get_frame_pc
	instead of read_pc.

---
 gdb/infcmd.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: src/gdb/infcmd.c
===================================================================
--- src.orig/gdb/infcmd.c	2008-12-05 23:02:12.000000000 +0000
+++ src/gdb/infcmd.c	2008-12-05 23:19:21.000000000 +0000
@@ -1181,7 +1181,7 @@ until_next_command (int from_tty)
      than the current line (if in symbolic section) or pc (if
      not). */
 
-  pc = read_pc ();
+  pc = get_frame_pc (frame);
   func = find_pc_function (pc);
 
   if (!func)
@@ -1405,11 +1405,13 @@ finish_backward (struct symbol *function
   struct thread_info *tp = inferior_thread ();
   struct breakpoint *breakpoint;
   struct cleanup *old_chain;
+  CORE_ADDR pc;
   CORE_ADDR func_addr;
   int back_up;
 
-  if (find_pc_partial_function (get_frame_pc (get_current_frame ()),
-				NULL, &func_addr, NULL) == 0)
+  pc = get_frame_pc (get_current_frame ());
+
+  if (find_pc_partial_function (pc, NULL, &func_addr, NULL) == 0)
     internal_error (__FILE__, __LINE__,
 		    _("Finish: couldn't find function."));
 
@@ -1426,7 +1428,7 @@ finish_backward (struct symbol *function
      no way that a function up the stack can have a return address
      that's equal to its entry point.  */
 
-  if (sal.pc != read_pc ())
+  if (sal.pc != pc)
     {
       /* Set breakpoint and continue.  */
       breakpoint =