From patchwork Fri Mar 23 20:55:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 26451 Received: (qmail 17978 invoked by alias); 23 Mar 2018 20:55:24 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 17375 invoked by uid 89); 23 Mar 2018 20:55:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=sk:find_pc, screw X-HELO: gateway31.websitewelcome.com Received: from gateway31.websitewelcome.com (HELO gateway31.websitewelcome.com) (192.185.144.29) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 23 Mar 2018 20:55:18 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 98D983DE2 for ; Fri, 23 Mar 2018 15:55:17 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id zTiXebNgfQUwqzTiXeS0uv; Fri, 23 Mar 2018 15:55:17 -0500 Received: from 174-29-60-18.hlrn.qwest.net ([174.29.60.18]:33476 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1ezTiX-001cSz-Ca; Fri, 23 Mar 2018 15:55:17 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA v3 08/13] Move some code later in backtrace_command_1 Date: Fri, 23 Mar 2018 14:55:07 -0600 Message-Id: <20180323205512.14434-9-tom@tromey.com> In-Reply-To: <20180323205512.14434-1-tom@tromey.com> References: <20180323205512.14434-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1ezTiX-001cSz-Ca X-Source-Sender: 174-29-60-18.hlrn.qwest.net (bapiya.Home) [174.29.60.18]:33476 X-Source-Auth: tom+tromey.com X-Email-Count: 9 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes PR backtrace/15584 notes that some code in backtrace_command_1 is not useful when frame filters are in use. This patch moves this code into the no-frame-filters "if". This also removes the unused local "trailing_level", which I noticed while moving the code around. gdb/ChangeLog 2018-03-23 Tom Tromey PR backtrace/15584: * stack.c (backtrace_command_1): Move some code into no-filters "if". --- gdb/ChangeLog | 6 ++++ gdb/stack.c | 105 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 59 insertions(+), 52 deletions(-) diff --git a/gdb/stack.c b/gdb/stack.c index 8e8fe12109..16f7931be1 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1698,49 +1698,17 @@ backtrace_command_1 (const char *count_exp, frame_filter_flags flags, struct frame_info *fi; int count; int i; - struct frame_info *trailing; - int trailing_level, py_start = 0, py_end = 0; + int py_start = 0, py_end = 0; enum ext_lang_bt_status result = EXT_LANG_BT_ERROR; if (!target_has_stack) error (_("No stack.")); - /* The following code must do two things. First, it must set the - variable TRAILING to the frame from which we should start - printing. Second, it must set the variable count to the number - of frames which we should print, or -1 if all of them. */ - trailing = get_current_frame (); - - trailing_level = 0; if (count_exp) { count = parse_and_eval_long (count_exp); if (count < 0) - { - struct frame_info *current; - - py_start = count; - count = -count; - - current = trailing; - while (current && count--) - { - QUIT; - current = get_prev_frame (current); - } - - /* Will stop when CURRENT reaches the top of the stack. - TRAILING will be COUNT below it. */ - while (current) - { - QUIT; - trailing = get_prev_frame (trailing); - current = get_prev_frame (current); - trailing_level++; - } - - count = -1; - } + py_start = count; else { py_start = 0; @@ -1755,24 +1723,6 @@ backtrace_command_1 (const char *count_exp, frame_filter_flags flags, count = -1; } - if (info_verbose) - { - /* Read in symbols for all of the frames. Need to do this in a - separate pass so that "Reading in symbols for xxx" messages - don't screw up the appearance of the backtrace. Also if - people have strong opinions against reading symbols for - backtrace this may have to be an option. */ - i = count; - for (fi = trailing; fi != NULL && i--; fi = get_prev_frame (fi)) - { - CORE_ADDR pc; - - QUIT; - pc = get_frame_address_in_block (fi); - expand_symtab_containing_pc (pc, find_pc_mapped_section (pc)); - } - } - if (! no_filters) { enum ext_lang_frame_args arg_type; @@ -1797,6 +1747,57 @@ backtrace_command_1 (const char *count_exp, frame_filter_flags flags, "no-filters" has been specified from the command. */ if (no_filters || result == EXT_LANG_BT_NO_FILTERS) { + struct frame_info *trailing; + + /* The following code must do two things. First, it must set the + variable TRAILING to the frame from which we should start + printing. Second, it must set the variable count to the number + of frames which we should print, or -1 if all of them. */ + trailing = get_current_frame (); + + if (count_exp != NULL && count < 0) + { + struct frame_info *current; + + count = -count; + + current = trailing; + while (current && count--) + { + QUIT; + current = get_prev_frame (current); + } + + /* Will stop when CURRENT reaches the top of the stack. + TRAILING will be COUNT below it. */ + while (current) + { + QUIT; + trailing = get_prev_frame (trailing); + current = get_prev_frame (current); + } + + count = -1; + } + + if (info_verbose) + { + /* Read in symbols for all of the frames. Need to do this in a + separate pass so that "Reading in symbols for xxx" messages + don't screw up the appearance of the backtrace. Also if + people have strong opinions against reading symbols for + backtrace this may have to be an option. */ + i = count; + for (fi = trailing; fi != NULL && i--; fi = get_prev_frame (fi)) + { + CORE_ADDR pc; + + QUIT; + pc = get_frame_address_in_block (fi); + expand_symtab_containing_pc (pc, find_pc_mapped_section (pc)); + } + } + for (i = 0, fi = trailing; fi && count--; i++, fi = get_prev_frame (fi)) { QUIT;