From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10229 invoked by alias); 5 Aug 2011 16:12:45 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 10160 invoked by uid 9674); 5 Aug 2011 16:12:41 -0000 Date: Fri, 05 Aug 2011 16:12:00 -0000 Message-ID: <20110805161241.10145.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-entryval: Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final X-Git-Refname: refs/heads/archer-jankratochvil-entryval X-Git-Reftype: branch X-Git-Oldrev: e86ab30c39061d11c1cacdc330d95be76539d862 X-Git-Newrev: 924f4d13c1cb817aadc5472e4123ed4562664397 X-SW-Source: 2011-q3/txt/msg00077.txt.bz2 List-Id: The branch, archer-jankratochvil-entryval has been updated via 924f4d13c1cb817aadc5472e4123ed4562664397 (commit) via 860bbefd93a60a7da83b62d33a9f1d031c5ab3d8 (commit) via 5c485a9a418b9f3801552b880f30d7174d68e51a (commit) via 99fc08e8b7dbe96423e9f377f6c65c3556e32bdd (commit) via b116ee61e56167ce354a111d2065a1a5ae268024 (commit) via 203d514d7a2006ca49724ec52932cc262e52b373 (commit) via d97c737ad3f0d79b520632b85e6889f656d2ec0f (commit) via 9f3eb48a1faf0425e5aacba352303317c7be9f2b (commit) via 46345c77df15bd8067dbb564b59a89e017b85412 (commit) via 3af540230cf077184c0d2a31ad5ea2d9ae995c33 (commit) via c4fa1f3e2cffdca9ac49c0e6b91d73e3720552c4 (commit) via 838247f9bd2bbad576ca6ff8e2991a4fd1730fbf (commit) via 664bd111fd05a811cd534bd010a6787a5c72e6c9 (commit) via f2ebbd0b8b1bd72e6e42dd75daab56a7024f3f93 (commit) via 173d43e4bb4b3301a86f29eaac43e19de1508a03 (commit) via f89661a601ba003a886054a90dcdf9942c2c8b24 (commit) via 617b61a7d0f9f13952ec1267fc3098b0ce004e6e (commit) via a7118fd38d39c510c1efbe8411bdf0d182ed621f (commit) via 9ffbcd24542a49b815e349c5cae41c8c0c7db7e1 (commit) via eda086697421bc4ee6454efc39cdf7452574c982 (commit) via 89ee7e175de0eefaa96b54ecbd55b5cb5b10e5b1 (commit) from e86ab30c39061d11c1cacdc330d95be76539d862 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 924f4d13c1cb817aadc5472e4123ed4562664397 Merge: d97c737 860bbef Author: Jan Kratochvil Date: Fri Aug 5 18:12:05 2011 +0200 Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final commit 860bbefd93a60a7da83b62d33a9f1d031c5ab3d8 Merge: 9f3eb48 5c485a9 Author: Jan Kratochvil Date: Fri Aug 5 18:12:05 2011 +0200 Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref commit 5c485a9a418b9f3801552b880f30d7174d68e51a Merge: 46345c7 99fc08e Author: Jan Kratochvil Date: Fri Aug 5 18:12:05 2011 +0200 Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp commit 99fc08e8b7dbe96423e9f377f6c65c3556e32bdd Merge: 3af5402 b116ee6 Author: Jan Kratochvil Date: Fri Aug 5 18:12:04 2011 +0200 Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref commit b116ee61e56167ce354a111d2065a1a5ae268024 Merge: c4fa1f3 203d514 Author: Jan Kratochvil Date: Fri Aug 5 18:12:04 2011 +0200 Merge branch 'commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into commands-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull commit 203d514d7a2006ca49724ec52932cc262e52b373 Author: Jan Kratochvil Date: Fri Aug 5 18:10:41 2011 +0200 testcase fix commit d97c737ad3f0d79b520632b85e6889f656d2ec0f Merge: e86ab30 9f3eb48 Author: Jan Kratochvil Date: Fri Aug 5 18:04:27 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final commit 9f3eb48a1faf0425e5aacba352303317c7be9f2b Merge: f883f01 46345c7 Author: Jan Kratochvil Date: Fri Aug 5 18:04:22 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref commit 46345c77df15bd8067dbb564b59a89e017b85412 Merge: 53b958d 3af5402 Author: Jan Kratochvil Date: Fri Aug 5 18:04:21 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp commit 3af540230cf077184c0d2a31ad5ea2d9ae995c33 Merge: b1c4be5 c4fa1f3 Author: Jan Kratochvil Date: Fri Aug 5 18:04:17 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref commit c4fa1f3e2cffdca9ac49c0e6b91d73e3720552c4 Merge: 44716a6 838247f Author: Jan Kratochvil Date: Fri Aug 5 18:04:15 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull commit 838247f9bd2bbad576ca6ff8e2991a4fd1730fbf Merge: eda0866 664bd11 Author: Jan Kratochvil Date: Fri Aug 5 18:04:13 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail-printarg' into funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt commit 664bd111fd05a811cd534bd010a6787a5c72e6c9 Merge: 5eb0af1 f2ebbd0 Author: Jan Kratochvil Date: Fri Aug 5 18:04:10 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe-selftail' into funcstuff-basic-tailread-tailframe-selftail-printarg commit f2ebbd0b8b1bd72e6e42dd75daab56a7024f3f93 Merge: b2002ce 173d43e Author: Jan Kratochvil Date: Fri Aug 5 18:04:10 2011 +0200 Merge branch 'funcstuff-basic-tailread-tailframe' into funcstuff-basic-tailread-tailframe-selftail commit 173d43e4bb4b3301a86f29eaac43e19de1508a03 Merge: e27d9d6 f89661a Author: Jan Kratochvil Date: Fri Aug 5 18:04:08 2011 +0200 Merge branch 'funcstuff-basic-tailread' into funcstuff-basic-tailread-tailframe commit f89661a601ba003a886054a90dcdf9942c2c8b24 Merge: d2988fa 617b61a Author: Jan Kratochvil Date: Fri Aug 5 18:04:05 2011 +0200 Merge branch 'funcstuff-basic' into funcstuff-basic-tailread commit 617b61a7d0f9f13952ec1267fc3098b0ce004e6e Merge: cf620e8 a7118fd Author: Jan Kratochvil Date: Fri Aug 5 18:04:04 2011 +0200 Merge branch 'funcstuff' into funcstuff-basic commit a7118fd38d39c510c1efbe8411bdf0d182ed621f Merge: 7b02f6c 9ffbcd2 Author: Jan Kratochvil Date: Fri Aug 5 18:03:59 2011 +0200 Merge branch 'commands' into funcstuff commit 9ffbcd24542a49b815e349c5cae41c8c0c7db7e1 Author: Jan Kratochvil Date: Fri Aug 5 18:03:38 2011 +0200 commands commit eda086697421bc4ee6454efc39cdf7452574c982 Author: Jan Kratochvil Date: Fri Aug 5 11:24:48 2011 +0200 code cleanup commit 89ee7e175de0eefaa96b54ecbd55b5cb5b10e5b1 Author: Jan Kratochvil Date: Fri Aug 5 11:21:37 2011 +0200 doc cleanup ----------------------------------------------------------------------- Summary of changes: gdb/breakpoint.c | 17 ----------------- gdb/breakpoint.h | 3 --- gdb/doc/gdb.texinfo | 5 ++--- gdb/event-loop.c | 3 +++ gdb/event-top.c | 1 + gdb/exceptions.c | 17 ----------------- gdb/main.c | 3 +++ gdb/printcmd.c | 10 ++++++++++ gdb/stack.c | 6 +++--- gdb/testsuite/gdb.base/break.exp | 6 +++--- gdb/top.c | 1 + 11 files changed, 26 insertions(+), 46 deletions(-) First 500 lines of diff: diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 1495a5e..d73f00e 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -3186,23 +3186,6 @@ bpstat_num (bpstat *bsp, int *num) return 1; } -/* Modify BS so that the actions will not be performed. */ - -void -bpstat_clear_actions (bpstat bs) -{ - for (; bs != NULL; bs = bs->next) - { - decref_counted_command_line (&bs->commands); - bs->commands_left = NULL; - if (bs->old_val != NULL) - { - value_free (bs->old_val); - bs->old_val = NULL; - } - } -} - /* Called when a command is about to proceed the inferior. */ static void diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h index 9b79e3e..4001d01 100644 --- a/gdb/breakpoint.h +++ b/gdb/breakpoint.h @@ -895,9 +895,6 @@ extern int bpstat_num (bpstat *, int *); command loop). */ extern void bpstat_do_actions (void); -/* Modify BS so that the actions will not be performed. */ -extern void bpstat_clear_actions (bpstat); - /* Implementation: */ /* Values used to tell the printing routine how to behave for this diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index ecdede3..c01bf1c 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -5947,9 +5947,8 @@ Similar, but print only the outermost @var{n} frames. @itemx bt full @itemx bt full @var{n} @itemx bt full -@var{n} -Print the values of the local variables also. - -@var{n} specifies the number of frames to print, as described above. +Print the values of the local variables also. @var{n} specifies the +number of frames to print, as described above. @end table @kindex where diff --git a/gdb/event-loop.c b/gdb/event-loop.c index ea69ccf..dea1383 100644 --- a/gdb/event-loop.c +++ b/gdb/event-loop.c @@ -486,6 +486,9 @@ start_event_loop (void) volatile struct gdb_exception ex; int result = 0; + quit_flag = 0; + immediate_quit = 0; + TRY_CATCH (ex, RETURN_MASK_ALL) { result = gdb_do_one_event (); diff --git a/gdb/event-top.c b/gdb/event-top.c index 37882728..fb46223 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -505,6 +505,7 @@ command_handler (char *command) struct cleanup *stat_chain; quit_flag = 0; + immediate_quit = 0; if (instream == stdin && stdin_is_tty) reinitialize_more_filter (); diff --git a/gdb/exceptions.c b/gdb/exceptions.c index 23a85fe..b16ff70 100644 --- a/gdb/exceptions.c +++ b/gdb/exceptions.c @@ -207,23 +207,6 @@ exceptions_state_mc_action_iter_1 (void) void throw_exception (struct gdb_exception exception) { - struct thread_info *tp = NULL; - - quit_flag = 0; - immediate_quit = 0; - - if (!ptid_equal (inferior_ptid, null_ptid)) - tp = find_thread_ptid (inferior_ptid); - - /* Perhaps it would be cleaner to do this via the cleanup chain (not sure - I can think of a reason why that is vital, though). */ - if (tp != NULL) - { - /* Clear queued breakpoint commands. */ - bpstat_clear_actions (tp->control.stop_bpstat); - } - - disable_current_display (); do_cleanups (ALL_CLEANUPS); /* Jump to the containing catch_errors() call, communicating REASON diff --git a/gdb/main.c b/gdb/main.c index 187c690..ca330f2 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -227,6 +227,9 @@ get_init_files (char **system_gdbinit, static int captured_command_loop (void *data) { + quit_flag = 0; + immediate_quit = 0; + current_interp_command_loop (); /* FIXME: cagney/1999-11-05: A correct command_loop() implementaton would clean things up (restoring the cleanup chain) to the state diff --git a/gdb/printcmd.c b/gdb/printcmd.c index 9a2ebc4..a803f68 100644 --- a/gdb/printcmd.c +++ b/gdb/printcmd.c @@ -1656,6 +1656,12 @@ undisplay_command (char *args, int from_tty) dont_repeat (); } +static void +disable_current_display_cleanup (void *unused) +{ + disable_current_display (); +} + /* Display a single auto-display. Do nothing if the display cannot be printed in the current context, or if the display is disabled. */ @@ -1664,6 +1670,7 @@ static void do_one_display (struct display *d) { int within_current_scope; + struct cleanup *back_to; if (d->enabled_p == 0) return; @@ -1715,6 +1722,7 @@ do_one_display (struct display *d) return; current_display_number = d->number; + back_to = make_cleanup (disable_current_display_cleanup, NULL); annotate_display_begin (); printf_filtered ("%d", d->number); @@ -1782,7 +1790,9 @@ do_one_display (struct display *d) annotate_display_end (); gdb_flush (gdb_stdout); + current_display_number = -1; + discard_cleanups (back_to); } /* Display all of the values on the auto-display chain which can be diff --git a/gdb/stack.c b/gdb/stack.c index e3219f0..2315342 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -432,13 +432,13 @@ print_frame_args (struct symbol *func, struct frame_info *frame, && (entry_vals != print_entry_values_if_needed || value_optimized_out (val))) { - const struct symbol_computed_ops *ops; volatile struct gdb_exception entryval_ex; - ops = SYMBOL_COMPUTED_OPS (sym); - TRY_CATCH (entryval_ex, RETURN_MASK_ERROR) { + const struct symbol_computed_ops *ops; + + ops = SYMBOL_COMPUTED_OPS (sym); entryval = ops->read_variable_at_entry (sym, frame); } diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index 15227bc..92fcc69 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -916,13 +916,13 @@ set bp_location14 [gdb_get_line_number "set breakpoint 14 here" $srcfile1] gdb_test_multiple "continue" \ "run until breakpoint set at small function, optimized file" { - -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { + -re "Breakpoint $decimal, marker4 \\(d=(d@entry=)?177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } - -re "Breakpoint $decimal, $hex in marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { + -re "Breakpoint $decimal, $hex in marker4 \\(d=(d@entry=)?177601976\\) at .*$srcfile1:$bp_location13\[\r\n\]+$bp_location13\[\t \]+void marker4.*" { pass "run until breakpoint set at small function, optimized file" } - -re "Breakpoint $decimal, marker4 \\(d=177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" { + -re "Breakpoint $decimal, marker4 \\(d=(d@entry=)?177601976\\) at .*$srcfile1:$bp_location14\[\r\n\]+$bp_location14\[\t \]+void marker4.*" { # marker4() is defined at line 46 when compiled with -DPROTOTYPES pass "run until breakpoint set at small function, optimized file (line bp_location14)" } diff --git a/gdb/top.c b/gdb/top.c index da930ca..a0e20a3 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -540,6 +540,7 @@ command_loop (void) (*window_hook) (instream, get_prompt (0)); quit_flag = 0; + immediate_quit = 0; if (instream == stdin && stdin_is_tty) reinitialize_more_filter (); old_chain = make_cleanup (null_cleanup, 0); hooks/post-receive -- Repository for Project Archer.