From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 111806 invoked by alias); 6 Nov 2019 01:39:39 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 111762 invoked by uid 306); 6 Nov 2019 01:39:39 -0000 Date: Wed, 06 Nov 2019 01:39:00 -0000 Message-ID: <20191106013939.111760.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix regression from TUI disassembly style patch X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 8e71a6e725ad881367f410f7d6f9a3106f3a2232 X-Git-Newrev: 825165c57e43b25ef57c3cf2cc345ec6aa40a0d3 X-SW-Source: 2019-11/txt/msg00012.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=825165c57e43b25ef57c3cf2cc345ec6aa40a0d3 commit 825165c57e43b25ef57c3cf2cc345ec6aa40a0d3 Author: Tom Tromey Date: Tue Nov 5 18:12:49 2019 -0700 Fix regression from TUI disassembly style patch My previous patch to add styling to the TUI disassembly failed to correctly fix a bug that Simon had pointed out in review. This patch fixes the bug. gdb/ChangeLog 2019-11-05 Tom Tromey * tui/tui-disasm.c (struct tui_asm_line) : New member. (tui_disassemble): Set addr_size. (tui_disasm_window::set_contents): Use addr_size. Change-Id: Ic0152f3b82a2f79be28ae46d590096661f271580 Diff: --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-disasm.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5720c8e..e886480 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2019-11-05 Tom Tromey + * tui/tui-disasm.c (struct tui_asm_line) : New member. + (tui_disassemble): Set addr_size. + (tui_disasm_window::set_contents): Use addr_size. + +2019-11-05 Tom Tromey + * rust-lang.c (rust_language_defn): Update. * python/py-value.c (valpy_string): Call c_get_string. * p-lang.c (pascal_language_defn): Update. diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index 7178326..8d5512e 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -47,6 +47,7 @@ struct tui_asm_line { CORE_ADDR addr; std::string addr_string; + size_t addr_size; std::string insn; }; @@ -110,6 +111,7 @@ tui_disassemble (struct gdbarch *gdbarch, else new_size = asm_lines[pos + i].addr_string.size (); *addr_size = std::max (*addr_size, new_size); + asm_lines[pos + i].addr_size = new_size; } pc = pc + gdb_print_insn (gdbarch, pc, &gdb_dis_out, NULL); @@ -239,8 +241,7 @@ tui_disasm_window::set_contents (struct gdbarch *arch, std::string line = (asm_lines[i].addr_string - + n_spaces (insn_pos - - asm_lines[i].addr_string.size ()) + + n_spaces (insn_pos - asm_lines[i].addr_size) + asm_lines[i].insn); const char *ptr = line.c_str ();