2011-05-20 Pedro Alves <pedro@codesourcery.com>

	gdb/
	* infcmd.c (step_1): Simplify synchronous case.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8bb74ed25da761ef4b75695d999eec52a95419fb..de59f42725d0cf8b37ab64703f0f62b3d7089acd 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-20  Pedro Alves  <pedro@codesourcery.com>
+
+       * infcmd.c (step_1): Simplify synchronous case.
+
 2011-05-20  Pedro Alves  <pedro@codesourcery.com>
 
        * tracepoint.c: Include exceptions.h.

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index be1f0a5ad24aaa0ec215739119ba6a61862166b7..ab1f2f93cbc5576632254b27b779a726856e057e 100644 (file)
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -889,23 +889,21 @@ step_1 (int skip_subroutines, int single_inst, char *count_string)
     {
       for (; count > 0; count--)
        {
-         struct thread_info *tp;
-
          step_once (skip_subroutines, single_inst, count, thread);
 
-         if (target_has_execution
-             && !ptid_equal (inferior_ptid, null_ptid))
-           tp = inferior_thread ();
+         if (!target_has_execution)
+           break;
          else
-           tp = NULL;
-
-         if (!tp || !tp->control.stop_step || !tp->step_multi)
            {
-             /* If we stopped for some reason that is not stepping
-                there are no further steps to make.  */
-             if (tp)
-               tp->step_multi = 0;
-             break;
+             struct thread_info *tp = inferior_thread ();
+
+             if (!tp->control.stop_step || !tp->step_multi)
+               {
+                 /* If we stopped for some reason that is not stepping
+                    there are no further steps to make.  */
+                 tp->step_multi = 0;
+                 break;
+               }
            }
        }