From: Pedro Alves <palves@redhat.com>
Date: Fri, 20 May 2011 16:20:25 +0000 (+0000)
Subject: 2011-05-20  Pedro Alves  <pedro@codesourcery.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=751b8ce122ef06e9bd673542e7876f44dcd0165c;p=binutils-gdb.git

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 8bb74ed25da..de59f42725d 100644
--- 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 be1f0a5ad24..ab1f2f93cbc 100644
--- 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;
+		}
 	    }
 	}