diff options
| author | Daniel Jacobowitz <drow@false.org> | 2008-07-15 18:58:32 +0000 |
|---|---|---|
| committer | Daniel Jacobowitz <drow@false.org> | 2008-07-15 18:58:32 +0000 |
| commit | 54af988d1e631ef9f44c83cc23cbc33bdcf12cf5 (patch) | |
| tree | b67c0b548851cb0185d7ce778de4bcfb412f6019 /gdb/infrun.c | |
| parent | ba2c6aec01a024592f7dce65f0628a93e39f4abe (diff) | |
| download | gdb-54af988d1e631ef9f44c83cc23cbc33bdcf12cf5.zip gdb-54af988d1e631ef9f44c83cc23cbc33bdcf12cf5.tar.gz gdb-54af988d1e631ef9f44c83cc23cbc33bdcf12cf5.tar.bz2 | |
* frame.c (frame_unwind_id): Renamed to ...
(frame_unwind_caller_id): ... this. All callers updated.
(frame_pc_unwind): Renamed to ...
(frame_unwind_caller_pc): ... this. All callers updated.
* frame.h: Document frame_unwind_caller_WHAT functions.
(frame_unwind_id): Renamed to ...
(frame_unwind_caller_id): ... this.
(frame_pc_unwind): Renamed to ...
(frame_unwind_caller_pc): ... this.
* hppa-tdep.c (hppa_find_unwind_entry_in_block): Correct comment.
* stack.c (parse_frame_specification_1): Do not rely on
frame_unwind_id.
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 2f32a82..f7ce888 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -3067,7 +3067,8 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (!gdbarch_get_longjmp_target)\n"); being equal, so to get into this block, both the current and previous frame must have valid frame IDs. */ if (!frame_id_eq (get_frame_id (get_current_frame ()), step_frame_id) - && frame_id_eq (frame_unwind_id (get_current_frame ()), step_frame_id)) + && frame_id_eq (frame_unwind_caller_id (get_current_frame ()), + step_frame_id)) { CORE_ADDR real_stop_pc; @@ -3220,7 +3221,7 @@ infrun: BPSTAT_WHAT_SET_LONGJMP_RESUME (!gdbarch_get_longjmp_target)\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 (get_current_frame ()))) + || !frame_id_p (frame_unwind_caller_id (get_current_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 @@ -3469,7 +3470,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) @@ -3478,15 +3479,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 - (current_gdbarch, frame_pc_unwind (next_frame)); + (current_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 |