* infrun.c (step_into_function): Account for possible breakpoint

	adjustment when computing ``stop_func_start''.

2 files changed, 28 insertions, 0 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 489443202af..1967a1e4f07 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-19  Kevin Buettner  <kevinb@redhat.com>
 
+	* infrun.c (step_into_function): Account for possible breakpoint
+	adjustment when computing ``stop_func_start''.
+
+2004-01-19  Kevin Buettner  <kevinb@redhat.com>
+
 	* target.c (default_region_size_ok_for_hw_watchpoint): Compare
 	the region size against the size of a pointer, not the size of
 	a register as given by DEPRECATED_REGISTER_SIZE.
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 1ecbcc6a7a9..b10d65f76ff 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2757,6 +2757,29 @@ step_into_function (struct execution_control_state *ecs)
       && ecs->sal.end < ecs->stop_func_end)
     ecs->stop_func_start = ecs->sal.end;
 
+  /* Architectures which require breakpoint adjustment might not be able
+     to place a breakpoint at the computed address.  If so, the test
+     ``ecs->stop_func_start == stop_pc'' will never succeed.  Adjust
+     ecs->stop_func_start to an address at which a breakpoint may be
+     legitimately placed.
+     
+     Note:  kevinb/2004-01-19:  On FR-V, if this adjustment is not
+     made, GDB will enter an infinite loop when stepping through
+     optimized code consisting of VLIW instructions which contain
+     subinstructions corresponding to different source lines.  On
+     FR-V, it's not permitted to place a breakpoint on any but the
+     first subinstruction of a VLIW instruction.  When a breakpoint is
+     set, GDB will adjust the breakpoint address to the beginning of
+     the VLIW instruction.  Thus, we need to make the corresponding
+     adjustment here when computing the stop address.  */
+     
+  if (gdbarch_adjust_breakpoint_address_p (current_gdbarch))
+    {
+      ecs->stop_func_start
+	= gdbarch_adjust_breakpoint_address (current_gdbarch,
+	                                     ecs->stop_func_start);
+    }
+
   if (ecs->stop_func_start == stop_pc)
     {
       /* We are already there: stop now.  */