From patchwork Wed Oct 30 22:56:04 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: 35500 Received: (qmail 107878 invoked by alias); 30 Oct 2019 22:56:10 -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 107870 invoked by uid 89); 30 Oct 2019 22:56:10 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 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; Wed, 30 Oct 2019 22:56:09 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 834D5203AF; Wed, 30 Oct 2019 18:56:06 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [8.43.85.239]) by mx1.osci.io (Postfix) with ESMTP id CF573204A6; Wed, 30 Oct 2019 18:56:04 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id B4A2820AF6; Wed, 30 Oct 2019 18:56:04 -0400 (EDT) X-Gerrit-PatchSet: 3 Date: Wed, 30 Oct 2019 18:56:04 -0400 From: "Tom Tromey (Code Review)" To: Simon Marchi , gdb-patches@sourceware.org Auto-Submitted: auto-generated X-Gerrit-MessageType: newpatchset Subject: [review v3] Change tui_source_element::line to have type std::string X-Gerrit-Change-Id: Id600f3e1d386a2911f187366e05e2ec599068dd2 X-Gerrit-Change-Number: 178 X-Gerrit-ChangeURL: X-Gerrit-Commit: eaf4b36dcf1600de6bb02d67450b4b8496e06146 In-Reply-To: References: Reply-To: tromey@sourceware.org, simon.marchi@polymtl.ca, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/3.0.3-75-g9005159e5d Message-Id: <20191030225604.B4A2820AF6@gnutoolchain-gerrit.osci.io> Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/178 ...................................................................... Change tui_source_element::line to have type std::string This changes tui_source_element::line to be of type std::string. This reduces the number of copies made. gdb/ChangeLog 2019-10-23 Tom Tromey * tui/tui-winsource.h (struct tui_source_element) : Now a std::string. * tui/tui-winsource.c (tui_show_source_line): Update. * tui/tui-source.c (tui_source_window::set_contents): Update. * tui/tui-disasm.c (tui_disasm_window::set_contents): Update. Change-Id: Id600f3e1d386a2911f187366e05e2ec599068dd2 --- M gdb/ChangeLog M gdb/tui/tui-disasm.c M gdb/tui/tui-source.c M gdb/tui/tui-winsource.c M gdb/tui/tui-winsource.h 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0382082..5f93b2b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-10-23 Tom Tromey + + * tui/tui-winsource.h (struct tui_source_element) : Now a + std::string. + * tui/tui-winsource.c (tui_show_source_line): Update. + * tui/tui-source.c (tui_source_window::set_contents): Update. + * tui/tui-disasm.c (tui_disasm_window::set_contents): Update. + 2019-10-30 Christian Biesinger * minsyms.c (clear_minimal_symbol_hash_tables): New function. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 33a3ba1..91c9845 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -216,10 +216,10 @@ + asm_lines[i].insn); /* Now copy the line taking the offset into account. */ - if (line.size() > offset) - src->line.reset (xstrndup (&line[offset], line_width)); + if (line.size () > offset) + src->line = line.substr (offset, line_width); else - src->line = make_unique_xstrdup (""); + src->line.clear (); src->line_or_addr.loa = LOA_ADDRESS; src->line_or_addr.u.addr = asm_lines[i].addr; diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c index bb1013b..f956645 100644 --- a/gdb/tui/tui-source.c +++ b/gdb/tui/tui-source.c @@ -183,7 +183,7 @@ symtab_to_fullname (s)) == 0 && cur_line_no == locator->line_no); - content[cur_line].line = make_unique_xstrdup (text.c_str ()); + content[cur_line].line = std::move (text); cur_line++; cur_line_no++; diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 3fbc49f..5d0bcb4 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -222,7 +222,7 @@ tui_set_reverse_mode (win_info->handle.get (), true); wmove (win_info->handle.get (), lineno, TUI_EXECINFO_SIZE); - tui_puts (line->line.get (), win_info->handle.get ()); + tui_puts (line->line.c_str (), win_info->handle.get ()); if (line->is_exec_point) tui_set_reverse_mode (win_info->handle.get (), false); diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h index 9417b28..185d3dd 100644 --- a/gdb/tui/tui-winsource.h +++ b/gdb/tui/tui-winsource.h @@ -62,7 +62,7 @@ { } - gdb::unique_xmalloc_ptr line; + std::string line; struct tui_line_or_address line_or_addr; bool is_exec_point = false; tui_bp_flags break_mode = 0;