From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19618 invoked by alias); 9 Sep 2011 23:01:41 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 19578 invoked by uid 9674); 9 Sep 2011 23:01:39 -0000 Date: Fri, 09 Sep 2011 23:01:00 -0000 Message-ID: <20110909230139.19563.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-entryval: Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into pending-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: 59dbaeb93c81853f00c86f1fee48a27c45000aa5 X-Git-Newrev: 6b0085a4fa3da91e3e703b4dfebb7370d46b0791 X-SW-Source: 2011-q3/txt/msg00139.txt.bz2 List-Id: The branch, archer-jankratochvil-entryval has been updated via 6b0085a4fa3da91e3e703b4dfebb7370d46b0791 (commit) via c5f91ba72649bba25e1901e3ce8eeefda460f2fa (commit) via 6ede9e71e7b72d4c20aa2974452ecc0dc3e62a63 (commit) via 0aa73dc0321cad017027316ee710e7ff9b920823 (commit) via ad9634c8790a7a668deff698558f233c34522b5f (commit) via 58a9041bcbab7c8fe43aae7d0f91d5ddf5ea95d5 (commit) via c773d4ceff6a94650ae2ac165f311a802a074134 (commit) via edd41ffc2e56bbd5c88491f6de9b741514940581 (commit) via 3a3ade2909a51313f708516d4c1243495cbb8b67 (commit) via e64942eb19d426c478997e653f9060c138afa921 (commit) via 7a562423773080998cb0724d5f65ed87672c4950 (commit) via dfa2933d4eae51a82bd700316ee2d40d9b5498ff (commit) via fa6d28e704b3425d5d98b3729f03dea7e4287a90 (commit) from 59dbaeb93c81853f00c86f1fee48a27c45000aa5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 6b0085a4fa3da91e3e703b4dfebb7370d46b0791 Merge: edd41ff c5f91ba Author: Jan Kratochvil Date: Sat Sep 10 01:01:23 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final commit c5f91ba72649bba25e1901e3ce8eeefda460f2fa Merge: 3a3ade2 6ede9e7 Author: Jan Kratochvil Date: Sat Sep 10 01:01:19 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref commit 6ede9e71e7b72d4c20aa2974452ecc0dc3e62a63 Merge: e64942e 0aa73dc Author: Jan Kratochvil Date: Sat Sep 10 01:01:18 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp commit 0aa73dc0321cad017027316ee710e7ff9b920823 Merge: 7a56242 ad9634c Author: Jan Kratochvil Date: Sat Sep 10 01:01:16 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref commit ad9634c8790a7a668deff698558f233c34522b5f Merge: dfa2933 58a9041 Author: Jan Kratochvil Date: Sat Sep 10 01:01:14 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull commit 58a9041bcbab7c8fe43aae7d0f91d5ddf5ea95d5 Merge: fa6d28e c773d4c Author: Jan Kratochvil Date: Sat Sep 10 01:01:11 2011 +0200 . commit c773d4ceff6a94650ae2ac165f311a802a074134 Author: Jan Kratochvil Date: Sat Sep 10 00:59:29 2011 +0200 . commit edd41ffc2e56bbd5c88491f6de9b741514940581 Merge: 59dbaeb 3a3ade2 Author: Jan Kratochvil Date: Sat Sep 10 00:45:44 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref-final commit 3a3ade2909a51313f708516d4c1243495cbb8b67 Merge: bcb73dc e64942e Author: Jan Kratochvil Date: Sat Sep 10 00:45:43 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp-entrybtref commit e64942eb19d426c478997e653f9060c138afa921 Merge: 1b1e747 7a56242 Author: Jan Kratochvil Date: Sat Sep 10 00:45:43 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref-entryexp commit 7a562423773080998cb0724d5f65ed87672c4950 Merge: 7267faa dfa2933 Author: Jan Kratochvil Date: Sat Sep 10 00:45:42 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull-dispref commit dfa2933d4eae51a82bd700316ee2d40d9b5498ff Merge: f52d74e fa6d28e Author: Jan Kratochvil Date: Sat Sep 10 00:45:42 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull commit fa6d28e704b3425d5d98b3729f03dea7e4287a90 Author: Jan Kratochvil Date: Sat Sep 10 00:45:31 2011 +0200 . ----------------------------------------------------------------------- Summary of changes: gdb/stack.c | 11 ++++++----- gdb/testsuite/gdb.mi/Makefile.in | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) First 500 lines of diff: diff --git a/gdb/stack.c b/gdb/stack.c index 41936ef..e3fefeb 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -193,13 +193,10 @@ print_frame_arg (const struct frame_arg *arg) struct cleanup *old_chain; struct ui_stream *stb; - /* True if we should print arguments, false otherwise. */ - int print_args = strcmp (print_frame_arguments, "none"); - stb = ui_out_stream_new (uiout); old_chain = make_cleanup_ui_out_stream_delete (stb); - gdb_assert ((arg->val && !arg->error) || (!arg->val && arg->error)); + gdb_assert (!arg->val || !arg->error); gdb_assert (arg->entry_kind == print_entry_values_no || arg->entry_kind == print_entry_values_only || (!ui_out_is_mi_like_p (uiout) @@ -227,7 +224,7 @@ print_frame_arg (const struct frame_arg *arg) annotate_arg_name_end (); ui_out_text (uiout, "="); - if (!print_args) + if (!arg->val && !arg->error) ui_out_text (uiout, "..."); else { @@ -437,6 +434,7 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame, argp->sym = sym; argp->val = val; argp->error = val_error ? xstrdup (val_error) : NULL; + gdb_assert (argp->val || argp->error); if (!val && !val_error) argp->entry_kind = print_entry_values_only; else if ((print_entry_values == print_entry_values_compact @@ -451,6 +449,7 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame, entryargp->sym = sym; entryargp->val = entryval; entryargp->error = entryval_error ? xstrdup (entryval_error) : NULL; + gdb_assert (entryargp->val || entryargp->error); if (!entryval && !entryval_error) entryargp->entry_kind = print_entry_values_no; else @@ -613,8 +612,10 @@ print_frame_args (struct symbol *func, struct frame_info *frame, if (!print_args) { memset (&arg, 0, sizeof (arg)); + arg.sym = sym; arg.entry_kind = print_entry_values_no; memset (&entryarg, 0, sizeof (entryarg)); + entryarg.sym = sym; entryarg.entry_kind = print_entry_values_no; } else diff --git a/gdb/testsuite/gdb.mi/Makefile.in b/gdb/testsuite/gdb.mi/Makefile.in index e8754f4..dc1f1a3 100644 --- a/gdb/testsuite/gdb.mi/Makefile.in +++ b/gdb/testsuite/gdb.mi/Makefile.in @@ -9,7 +9,8 @@ PROGS = basics c_variable cpp_variable var-cmd dw2-ref-missing-frame \ mi-pending mi-pthreads mi-read-memory mi-regs mi-return \ mi-reverse mi-simplerun mi-stack mi-stepi mi-syn-frame \ mi-var-block mi-var-child mi-var-cmd mi-var-cp mi-var-display \ - mi-var-invalidate mi-var-invalidate_bis mi-watch mi2-basics \ + mi-var-invalidate mi-var-invalidate_bis mi-watch \ + mi2-amd64-entry-value mi2-basics \ mi2-break mi2-cli mi2-disassemble mi2-eval mi2-file \ mi2-pthreads mi2-regs mi2-return mi2-simplerun mi2-stepi \ mi2-var-block mi2-var-child mi2-var-cmd mi2-var-display \ hooks/post-receive -- Repository for Project Archer.