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

adjustment when computing ``stop_func_start''.
This commit is contained in:
Kevin Buettner 2004-01-19 17:28:52 +00:00
parent 7e89635aac
commit 2dbd5e3068
2 changed files with 28 additions and 0 deletions

View File

@ -1,3 +1,8 @@
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

View File

@ -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. */