From 46d570866dcefb811d86157204ec614ba4f18c19 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Fri, 13 Apr 2007 13:33:10 +0000 Subject: [PATCH] * breakpoint.c (bpstat_what): Give step-resume higher priority than shlib events. --- gdb/ChangeLog | 5 +++++ gdb/breakpoint.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 03dc76b..06924fd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2007-04-13 Daniel Jacobowitz + * breakpoint.c (bpstat_what): Give step-resume higher priority than + shlib events. + +2007-04-13 Daniel Jacobowitz + * infrun.c: Doc fixes. (handle_inferior_event): Clarify debug message. (insert_step_resume_breakpoint_at_sal): Print a debug message. diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 4ca386c..fa1e653 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3120,10 +3120,10 @@ bpstat_what (bpstat bs) clrs < err shl shlr sn sr ss ts ss < shl shlr sn sr ts sn < shl shlr sr ts - sr < shl shlr ts - shl < shlr + shl < shlr sr + shlr < sr + sr < ts ts < - shlr < What I think this means is that we don't need a damned table here. If you just put the rows and columns in the right order, @@ -3160,13 +3160,13 @@ bpstat_what (bpstat bs) /*long_resume */ {clr, ss, sn, clrs, err, err, err, sr, ts, shl, shlr}, /*step_resume */ - {sr, sr, sr, sr, sr, sr, sr, sr, ts, shl, shlr}, + {sr, sr, sr, sr, sr, sr, sr, sr, ts, sr, sr}, /*through_sig */ {ts, ts, ts, ts, ts, ts, ts, ts, ts, shl, shlr}, /*shlib */ - {shl, shl, shl, shl, shl, shl, shl, shl, ts, shl, shlr}, + {shl, shl, shl, shl, shl, shl, shl, sr, ts, shl, shlr}, /*catch_shlib */ - {shlr, shlr, shlr, shlr, shlr, shlr, shlr, shlr, ts, shlr, shlr} + {shlr, shlr, shlr, shlr, shlr, shlr, shlr, sr, ts, shlr, shlr} }; #undef kc -- 2.7.4