From patchwork Thu Dec 12 02:35:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Simon Marchi (Code Review)" X-Patchwork-Id: 36767 Received: (qmail 17211 invoked by alias); 12 Dec 2019 02:41:55 -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 17130 invoked by uid 89); 12 Dec 2019 02:41:54 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.1 spammy= X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Dec 2019 02:41:52 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 359692048E; Wed, 11 Dec 2019 21:35:13 -0500 (EST) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id E7D4720A81 for ; Wed, 11 Dec 2019 21:35:05 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id D143725BB4 for ; Wed, 11 Dec 2019 21:35:05 -0500 (EST) X-Gerrit-PatchSet: 2 Date: Wed, 11 Dec 2019 21:35:02 -0500 From: "Tom Tromey (Code Review)" To: gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v2] Display "main" on initial TUI startup X-Gerrit-Change-Id: Ic7bfc930e1179f5b61111e30a2dae46a98b00064 X-Gerrit-Change-Number: 644 X-Gerrit-ChangeURL: X-Gerrit-Commit: f84f06f50138b5e544a027ecc6e0d66b0f99cdd0 In-Reply-To: References: Reply-To: tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-79-g83ff7f88f1 Message-Id: <20191212023505.D143725BB4@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/644 ...................................................................... Display "main" on initial TUI startup I noticed that even when there's a symbol file, "tui enable" won't show "main" by default. I think it should, and this patch fixes this. 2019-12-11 Tom Tromey * tui/tui.c (tui_enable): Call tui_display_main. gdb/testsuite/ChangeLog 2019-12-11 Tom Tromey * gdb.tui/list.exp: Check for source on initial listing. Change-Id: Ic7bfc930e1179f5b61111e30a2dae46a98b00064 --- M gdb/ChangeLog M gdb/testsuite/ChangeLog M gdb/testsuite/gdb.tui/list.exp M gdb/tui/tui.c 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 58eb3bb..fa571fc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2019-12-11 Tom Tromey + * tui/tui.c (tui_enable): Call tui_display_main. + +2019-12-11 Tom Tromey + * tui/tui-disasm.c (tui_get_begin_asm_address): Use get_current_source_symtab_and_line, and main_name. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b31e8dd..cb575fe 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2019-12-11 Tom Tromey + * gdb.tui/list.exp: Check for source on initial listing. + +2019-12-11 Tom Tromey + * gdb.tui/resize.exp: Fix regexp. * gdb.tui/regs.exp: Fix regexps. * gdb.tui/main.exp: Fix regexp. diff --git a/gdb/testsuite/gdb.tui/list.exp b/gdb/testsuite/gdb.tui/list.exp index 6efe193..08153c6 100644 --- a/gdb/testsuite/gdb.tui/list.exp +++ b/gdb/testsuite/gdb.tui/list.exp @@ -28,7 +28,7 @@ unsupported "TUI not supported" } -Term::check_contents "initial source listing" "No Source Available" +Term::check_contents "initial source listing" "21 *return 0" Term::command "layout asm" Term::check_contents "asm window shows main" "$hex
" diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index a0d2e4c..dbc890a 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -513,6 +513,8 @@ if (deprecated_safe_get_selected_frame ()) tui_show_frame_info (deprecated_safe_get_selected_frame ()); + else + tui_display_main (); /* Restore TUI keymap. */ tui_set_key_mode (tui_current_key_mode);