From 5b79abe7f19d73ff246909922f3c2da2af689779 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 15 Dec 2010 21:19:50 +0000 Subject: [PATCH] gdb * infrun.c (save_infcall_control_state): Handle the exception-resume breakpoint. (restore_infcall_control_state): Likewise. (discard_infcall_control_state): Likewise. gdb/testsuite 2010-12-15 Jan Kratochvil * gdb.cp/nextoverthrow.cc (dummy): Return int 0. (NextOverThrowDerivates) : New. (resumebpt_test): New. (main): Call resumebpt_test. * gdb.cp/nextoverthrow.exp: New block for test of "resumebpt". --- gdb/ChangeLog | 7 +++++++ gdb/infrun.c | 9 +++++++++ gdb/testsuite/ChangeLog | 8 ++++++++ gdb/testsuite/gdb.cp/nextoverthrow.cc | 36 ++++++++++++++++++++++++++++++++-- gdb/testsuite/gdb.cp/nextoverthrow.exp | 11 ++++++++++- 5 files changed, 68 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 629abfe..f8eb4c7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2010-12-15 Tom Tromey + + * infrun.c (save_infcall_control_state): Handle the + exception-resume breakpoint. + (restore_infcall_control_state): Likewise. + (discard_infcall_control_state): Likewise. + 2010-12-15 Kevin Buettner * mips-tdep.c (mips_pseudo_register_write): Sign extend 32-bit diff --git a/gdb/infrun.c b/gdb/infrun.c index 1bc00a4..f72a18d 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -6379,6 +6379,7 @@ save_infcall_control_state (void) inf_status->inferior_control = inf->control; tp->control.step_resume_breakpoint = NULL; + tp->control.exception_resume_breakpoint = NULL; /* Save original bpstat chain to INF_STATUS; replace it in TP with copy of chain. If caller's caller is walking the chain, they'll be happier if we @@ -6428,6 +6429,10 @@ restore_infcall_control_state (struct infcall_control_state *inf_status) if (tp->control.step_resume_breakpoint) tp->control.step_resume_breakpoint->disposition = disp_del_at_next_stop; + if (tp->control.exception_resume_breakpoint) + tp->control.exception_resume_breakpoint->disposition + = disp_del_at_next_stop; + /* Handle the bpstat_copy of the chain. */ bpstat_clear (&tp->control.stop_bpstat); @@ -6476,6 +6481,10 @@ discard_infcall_control_state (struct infcall_control_state *inf_status) inf_status->thread_control.step_resume_breakpoint->disposition = disp_del_at_next_stop; + if (inf_status->thread_control.exception_resume_breakpoint) + inf_status->thread_control.exception_resume_breakpoint->disposition + = disp_del_at_next_stop; + /* See save_infcall_control_state for info on stop_bpstat. */ bpstat_clear (&inf_status->thread_control.stop_bpstat); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0417538..9947918 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2010-12-15 Jan Kratochvil + + * gdb.cp/nextoverthrow.cc (dummy): Return int 0. + (NextOverThrowDerivates) : New. + (resumebpt_test): New. + (main): Call resumebpt_test. + * gdb.cp/nextoverthrow.exp: New block for test of "resumebpt". + 2010-12-12 Stan Shebs * gdb.trace/tsv.exp: Test print command on trace state variables. diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.cc b/gdb/testsuite/gdb.cp/nextoverthrow.cc index b25cb34..b618f15 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.cc +++ b/gdb/testsuite/gdb.cp/nextoverthrow.cc @@ -19,8 +19,9 @@ using namespace std; -void dummy () +int dummy () { + return 0; } class NextOverThrowDerivates @@ -89,10 +90,39 @@ public: function1 (val); // until here } + void resumebpt (int val) + { + try + { + throw val; + } + catch (int x) + { + dummy (); + } + } + }; NextOverThrowDerivates next_cases; +int +resumebpt_test (int x) +{ + try + { + next_cases.resumebpt (x); // Start: resumebpt + next_cases.resumebpt (x + 1); // Second: resumebpt + } + catch (int val) + { + dummy (); + x = val; + } + + return x; +} + int main () { int testval = -1; @@ -198,6 +228,8 @@ int main () testval = val; // End: advance } + // Test of "resumebpt". + testval = resumebpt_test (10); + testval = 32; // done } - diff --git a/gdb/testsuite/gdb.cp/nextoverthrow.exp b/gdb/testsuite/gdb.cp/nextoverthrow.exp index 960ea0d..3ec51f7 100644 --- a/gdb/testsuite/gdb.cp/nextoverthrow.exp +++ b/gdb/testsuite/gdb.cp/nextoverthrow.exp @@ -149,5 +149,14 @@ gdb_test "advance $line" ".*" "advance-over-throw" tbreak_and_cont "End: advance" verify_testval "pre-check - advance" 8 +tbreak_and_cont "Start: resumebpt" +gdb_test "tbreak _Unwind_RaiseException" +gdb_test "continue" "Temporary breakpoint.*" "continuing to _Unwind_RaiseException" +gdb_test "finish" "Run till exit .*" +gdb_test {set $retpc=$pc} +gdb_test {break *$retpc if dummy ()} +tbreak_and_cont "Second: resumebpt" +gdb_test "next" + tbreak_and_cont "done" -verify_testval "post-check - advance" 9 +verify_testval "post-check - advance" 10 -- 2.7.4