From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10596 invoked by alias); 1 Sep 2011 21:13:37 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 10557 invoked by uid 9674); 1 Sep 2011 21:13:37 -0000 Date: Thu, 01 Sep 2011 21:13:00 -0000 Message-ID: <20110901211337.10541.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: 1531931907caf9f117f8f0c87b1b77a61f5c828f X-Git-Newrev: 378d78b5515d8bfa2de9f19817b739d228bd3ad5 X-SW-Source: 2011-q3/txt/msg00124.txt.bz2 List-Id: The branch, archer-jankratochvil-entryval has been updated via 378d78b5515d8bfa2de9f19817b739d228bd3ad5 (commit) via e0591f9d2f483b249cee20b6f5e1fda27c80bc4e (commit) via b12b0bbb3359901c18fbb0e54e579fd06dfdacf4 (commit) via b0fca86c7877bbbf51cce03f550c2b70f65f2c63 (commit) via 37a73ef282228cb662b7d287266e780efff22287 (commit) via 08f781b71ecd906af9a5d840cf576939b02c84d1 (commit) from 1531931907caf9f117f8f0c87b1b77a61f5c828f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit 378d78b5515d8bfa2de9f19817b739d228bd3ad5 Merge: 15319319 e0591f9 Author: Jan Kratochvil Date: Thu Sep 1 23:13:22 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 e0591f9d2f483b249cee20b6f5e1fda27c80bc4e Merge: 51308b8 b12b0bb Author: Jan Kratochvil Date: Thu Sep 1 23:13: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 b12b0bbb3359901c18fbb0e54e579fd06dfdacf4 Merge: 7b8afe4 b0fca86 Author: Jan Kratochvil Date: Thu Sep 1 23:13: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 b0fca86c7877bbbf51cce03f550c2b70f65f2c63 Merge: 2584fe3 37a73ef Author: Jan Kratochvil Date: Thu Sep 1 23:13:18 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 37a73ef282228cb662b7d287266e780efff22287 Merge: 4115777 08f781b Author: Jan Kratochvil Date: Thu Sep 1 23:13:17 2011 +0200 Merge branch 'pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt' into pending-funcstuff-basic-tailread-tailframe-selftail-printarg-entrybt-lvalnull commit 08f781b71ecd906af9a5d840cf576939b02c84d1 Author: Jan Kratochvil Date: Thu Sep 1 23:13:09 2011 +0200 . ----------------------------------------------------------------------- Summary of changes: gdb/frame.h | 5 +++-- gdb/stack.c | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) First 500 lines of diff: diff --git a/gdb/frame.h b/gdb/frame.h index ea8cebc..f325341 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -729,8 +729,9 @@ struct frame_arg const char *entry_kind; }; -extern int read_frame_arg (struct symbol *sym, struct frame_info *frame, - struct frame_arg *argp, struct frame_arg *entryargp); +extern void read_frame_arg (struct symbol *sym, struct frame_info *frame, + struct frame_arg *argp, + struct frame_arg *entryargp); extern void args_info (char *, int); diff --git a/gdb/stack.c b/gdb/stack.c index 11e4485..262e4ce 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -251,13 +251,13 @@ print_frame_arg (const struct frame_arg *arg) do_cleanups (old_chain); } -int +void read_frame_arg (struct symbol *sym, struct frame_info *frame, struct frame_arg *argp, struct frame_arg *entryargp) { struct value *val = NULL, *entryval = NULL; char *val_error = NULL, *entryval_error = NULL; - int val_equal = 0, seen_entry_val = 0; + int val_equal = 0; volatile struct gdb_exception except; if (print_entry_values != print_entry_values_only @@ -293,13 +293,11 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame, } if (except.error == NO_ENTRY_VALUE_ERROR - || value_optimized_out (entryval)) + || (entryval && value_optimized_out (entryval))) { entryval = NULL; entryval_error = NULL; } - else - seen_entry_val = 1; if (!ui_out_is_mi_like_p (current_uiout) && (print_entry_values == print_entry_values_compact @@ -421,8 +419,6 @@ read_frame_arg (struct symbol *sym, struct frame_info *frame, entryargp->entry_kind = print_entry_values_no; else entryargp->entry_kind = print_entry_values_only; - - return seen_entry_val; } /* Print the arguments of frame FRAME on STREAM, given the function hooks/post-receive -- Repository for Project Archer.