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

	instead of read_pc.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb3917f1547b7bf2e6a5727685930203f90d4c16..67b6515fd5500fc1874627d42196ed2741383cd7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-10  Pedro Alves  <pedro@codesourcery.com>
+
+       * infcmd.c (until_next_command, finish_backward): Use get_frame_pc
+       instead of read_pc.
+
 2008-12-09  Tom Tromey  <tromey@redhat.com>
 
        PR gdb/1815:

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 9bfe2d496cafa704bd02e553937673c97f4313d6..d6772d3ce6feb408ed4c6d457999bab398962741 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -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 =