* infrun.c: Remove step_resume_{duplicate,shadow}. Replace

	step_resume_break_address with step_resume_breakpoint (now local
	to wait_for_inferior).
	({insert,remove}_step_breakpoint): Remove.
	(wait_for_inferior): Set step resume break with
	set_momentary_breakpoint.  Test hitting it with bpstat_stop_status
	and bpstat_what	(stop_step_resume_break removed).
	* breakpoint.{h,c}, infrun.c: Return value from bpstat_what now struct
	which includes previous return value as main_action, and a step_resume
	bit.
	* breakpoint.c (delete_breakpoint): If breakpoint was inserted, and
	there is another breakpoint there, insert it.
	* infrun.c (wait_for_inferior): Rearrange the spaghetti a bit.  Use
	a few more gotos.
	Various: Clean up and add comments.

1 files changed, 4 insertions, 3 deletions

diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 4aaa791..77015a1 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -399,11 +399,12 @@ step_1 (skip_subroutines, single_inst, count_string)
 	}
       else
 	{
-	  /* Say we are stepping, but stop after one insn whatever it does.
-	     Don't step through subroutine calls even to undebuggable
-	     functions.  */
+	  /* Say we are stepping, but stop after one insn whatever it does.  */
 	  step_range_start = step_range_end = 1;
 	  if (!skip_subroutines)
+	    /* It is stepi.
+	       Don't step over function calls, not even to functions lacking
+	       line numbers.  */
 	    step_over_calls = 0;
 	}