diff options
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 167252a..5f1b16b 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3729,7 +3729,7 @@ infrun: not switching back to stepped thread, it has vanished\n"); previous frame must have valid frame IDs. */ if (!frame_id_eq (get_frame_id (frame), ecs->event_thread->step_frame_id) - && (frame_id_eq (frame_unwind_id (frame), + && (frame_id_eq (frame_unwind_caller_id (frame), ecs->event_thread->step_frame_id) || execution_direction == EXEC_REVERSE)) { @@ -3928,7 +3928,7 @@ infrun: not switching back to stepped thread, it has vanished\n"); set step-mode) or we no longer know how to get back to the call site. */ if (step_stop_if_no_debug - || !frame_id_p (frame_unwind_id (frame))) + || !frame_id_p (frame_unwind_caller_id (frame))) { /* If we have no line number and the step-stop-if-no-debug is set, we stop the step so that the user has a chance to @@ -4204,7 +4204,7 @@ insert_step_resume_breakpoint_at_frame (struct frame_info *return_frame) This is a separate function rather than reusing insert_step_resume_breakpoint_at_frame in order to avoid get_prev_frame, which may stop prematurely (see the implementation - of frame_unwind_id for an example). */ + of frame_unwind_caller_id for an example). */ static void insert_step_resume_breakpoint_at_caller (struct frame_info *next_frame) @@ -4214,14 +4214,16 @@ insert_step_resume_breakpoint_at_caller (struct frame_info *next_frame) /* We shouldn't have gotten here if we don't know where the call site is. */ - gdb_assert (frame_id_p (frame_unwind_id (next_frame))); + gdb_assert (frame_id_p (frame_unwind_caller_id (next_frame))); init_sal (&sr_sal); /* initialize to zeros */ - sr_sal.pc = gdbarch_addr_bits_remove (gdbarch, frame_pc_unwind (next_frame)); + sr_sal.pc = gdbarch_addr_bits_remove (gdbarch, + frame_unwind_caller_pc (next_frame)); sr_sal.section = find_pc_overlay (sr_sal.pc); - insert_step_resume_breakpoint_at_sal (sr_sal, frame_unwind_id (next_frame)); + insert_step_resume_breakpoint_at_sal (sr_sal, + frame_unwind_caller_id (next_frame)); } /* Insert a "longjmp-resume" breakpoint at PC. This is used to set a |