mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-04 15:54:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

2012-02-24 Jan Kratochvil <jan.kratochvil@redhat.com>

Browse Source 
Pedro Alves  <palves@redhat.com>

	* breakpoint.c (until_break_command): Install breakpoints after
	all frame manipulations.
This commit is contained in:
Pedro Alves 2012-02-24 16:26:36 +00:00
parent b745defe51
commit 883bc8d1cb
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2012-02-24 Jan Kratochvil <jan.kratochvil@redhat.com>
Pedro Alves <palves@redhat.com>
* breakpoint.c (until_break_command): Install breakpoints after
all frame manipulations.
2012-02-24 Luis Machado <lgustavo@codesourcery.com> 2012-02-24 Luis Machado <lgustavo@codesourcery.com>
* remote.c (remote_supports_cond_breakpoints): New forward * remote.c (remote_supports_cond_breakpoints): New forward

48
gdb/breakpoint.c
View File

@ -10418,6 +10418,9 @@ until_break_command (char *arg, int from_tty, int anywhere)
struct symtabs_and_lines sals; struct symtabs_and_lines sals;
struct symtab_and_line sal; struct symtab_and_line sal;
struct frame_info *frame = get_selected_frame (NULL); struct frame_info *frame = get_selected_frame (NULL);
struct gdbarch *frame_gdbarch = get_frame_arch (frame);
struct frame_id stack_frame_id = get_stack_frame_id (frame);
struct frame_id caller_frame_id = frame_unwind_caller_id (frame);
struct breakpoint *breakpoint; struct breakpoint *breakpoint;
struct breakpoint *breakpoint2 = NULL; struct breakpoint *breakpoint2 = NULL;
struct cleanup *old_chain; struct cleanup *old_chain;
@ -10448,40 +10451,45 @@ until_break_command (char *arg, int from_tty, int anywhere)
resolve_sal_pc (&sal); resolve_sal_pc (&sal);
if (anywhere)
/* If the user told us to continue until a specified location,
we don't specify a frame at which we need to stop. */
breakpoint = set_momentary_breakpoint (get_frame_arch (frame), sal,
null_frame_id, bp_until);
else
/* Otherwise, specify the selected frame, because we want to stop
only at the very same frame. */
breakpoint = set_momentary_breakpoint (get_frame_arch (frame), sal,
get_stack_frame_id (frame),
bp_until);
old_chain = make_cleanup_delete_breakpoint (breakpoint);
tp = inferior_thread (); tp = inferior_thread ();
thread = tp->num; thread = tp->num;
old_chain = make_cleanup (null_cleanup, NULL);
/* Installing a breakpoint invalidates the frame chain (as it may
need to switch threads), so do any frame handling first. */
/* Keep within the current frame, or in frames called by the current /* Keep within the current frame, or in frames called by the current
one. */ one. */
if (frame_id_p (frame_unwind_caller_id (frame))) if (frame_id_p (caller_frame_id))
{ {
sal = find_pc_line (frame_unwind_caller_pc (frame), 0); struct symtab_and_line sal2;
sal.pc = frame_unwind_caller_pc (frame);
sal2 = find_pc_line (frame_unwind_caller_pc (frame), 0);
sal2.pc = frame_unwind_caller_pc (frame);
breakpoint2 = set_momentary_breakpoint (frame_unwind_caller_arch (frame), breakpoint2 = set_momentary_breakpoint (frame_unwind_caller_arch (frame),
sal, sal2,
frame_unwind_caller_id (frame), caller_frame_id,
bp_until); bp_until);
make_cleanup_delete_breakpoint (breakpoint2); make_cleanup_delete_breakpoint (breakpoint2);
set_longjmp_breakpoint (tp, frame_unwind_caller_id (frame)); set_longjmp_breakpoint (tp, caller_frame_id);
make_cleanup (delete_longjmp_breakpoint_cleanup, &thread); make_cleanup (delete_longjmp_breakpoint_cleanup, &thread);
} }
if (anywhere)
/* If the user told us to continue until a specified location,
we don't specify a frame at which we need to stop. */
breakpoint = set_momentary_breakpoint (frame_gdbarch, sal,
null_frame_id, bp_until);
else
/* Otherwise, specify the selected frame, because we want to stop
only at the very same frame. */
breakpoint = set_momentary_breakpoint (frame_gdbarch, sal,
stack_frame_id, bp_until);
make_cleanup_delete_breakpoint (breakpoint);
proceed (-1, TARGET_SIGNAL_DEFAULT, 0); proceed (-1, TARGET_SIGNAL_DEFAULT, 0);
/* If we are running asynchronously, and proceed call above has /* If we are running asynchronously, and proceed call above has