From patchwork Thu Jul 4 17:02:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 33560 Received: (qmail 107165 invoked by alias); 4 Jul 2019 17:03:39 -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 105875 invoked by uid 89); 4 Jul 2019 17:03:30 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy= X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.149.62) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 04 Jul 2019 17:03:25 +0000 Received: from cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 028331093B3 for ; Thu, 4 Jul 2019 12:03:24 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id j58lhF0N590onj58lhBMaB; Thu, 04 Jul 2019 12:03:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mSAKIoagBy90f/aw4Bx/Otuhk5/Sjtk0Z7VCC34Vdyo=; b=vmzD/LvMc0jRUvq32mRAkFIRwu M9DAb2dWYQCiMm1CJIeolVFNv5YhCsbRSfdYcOkZ8BfFIOCHufSS2/yEQrUsuHiBZ8+11Ds1oy1b4 N+d+ucpVgFzgUpcAC+uxZ/Msa; Received: from 174-29-58-150.hlrn.qwest.net ([174.29.58.150]:34694 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1hj58l-002sFu-K1; Thu, 04 Jul 2019 12:03:23 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 26/61] Add win_info parameter to tui_set_disassem_content Date: Thu, 4 Jul 2019 11:02:36 -0600 Message-Id: <20190704170311.15982-27-tom@tromey.com> In-Reply-To: <20190704170311.15982-1-tom@tromey.com> References: <20190704170311.15982-1-tom@tromey.com> This adds a win_info parameter to tui_set_disassem_content, removing uses of the TUI_DISASM_WIN global. 2019-07-04 Tom Tromey * tui/tui-winsource.c (tui_update_source_window_as_is): Update. * tui/tui-disasm.h (tui_set_disassem_content): Add win_info parameter. * tui/tui-disasm.c (tui_set_disassem_content): Add win_info parameter. --- gdb/ChangeLog | 8 ++++++++ gdb/tui/tui-disasm.c | 22 +++++++++++----------- gdb/tui/tui-disasm.h | 3 ++- gdb/tui/tui-winsource.c | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c index af1a7406be8..a644c287cab 100644 --- a/gdb/tui/tui-disasm.c +++ b/gdb/tui/tui-disasm.c @@ -161,10 +161,11 @@ tui_find_disassembly_address (struct gdbarch *gdbarch, CORE_ADDR pc, int from) /* Function to set the disassembly window's content. */ enum tui_status -tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc) +tui_set_disassem_content (tui_source_window_base *win_info, + struct gdbarch *gdbarch, CORE_ADDR pc) { int i; - int offset = TUI_DISASM_WIN->horizontal_offset; + int offset = win_info->horizontal_offset; int max_lines, line_width; CORE_ADDR cur_pc; struct tui_locator_window *locator = tui_locator_win_info_ptr (); @@ -177,17 +178,16 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc) if (pc == 0) return TUI_FAILURE; - tui_alloc_source_buffer (TUI_DISASM_WIN); + tui_alloc_source_buffer (win_info); - tui_source_window_base *base = TUI_DISASM_WIN; - base->gdbarch = gdbarch; - base->start_line_or_addr.loa = LOA_ADDRESS; - base->start_line_or_addr.u.addr = pc; + win_info->gdbarch = gdbarch; + win_info->start_line_or_addr.loa = LOA_ADDRESS; + win_info->start_line_or_addr.u.addr = pc; cur_pc = locator->addr; /* Window size, excluding highlight box. */ - max_lines = TUI_DISASM_WIN->height - 2; - line_width = TUI_DISASM_WIN->width - 2; + max_lines = win_info->height - 2; + line_width = win_info->width - 2; /* Get temporary table that will hold all strings (addr & insn). */ asm_lines = XALLOCAVEC (struct tui_asm_line, max_lines); @@ -217,12 +217,12 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc) line = (char*) alloca (insn_pos + insn_size + 1); /* Now construct each line. */ - TUI_DISASM_WIN->content.resize (max_lines); + win_info->content.resize (max_lines); for (i = 0; i < max_lines; i++) { int cur_len; - tui_source_element *src = &TUI_DISASM_WIN->content[i]; + tui_source_element *src = &win_info->content[i]; strcpy (line, asm_lines[i].addr_string); cur_len = strlen (line); memset (line + cur_len, ' ', insn_pos - cur_len); diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h index 925c7495947..59822c70c5c 100644 --- a/gdb/tui/tui-disasm.h +++ b/gdb/tui/tui-disasm.h @@ -25,7 +25,8 @@ #include "tui/tui.h" /* For enum tui_status. */ #include "tui/tui-data.h" /* For enum tui_scroll_direction. */ -extern enum tui_status tui_set_disassem_content (struct gdbarch *, CORE_ADDR); +extern enum tui_status tui_set_disassem_content (tui_source_window_base *, + struct gdbarch *, CORE_ADDR); extern void tui_show_disassem (struct gdbarch *, CORE_ADDR); extern void tui_show_disassem_and_update_source (struct gdbarch *, CORE_ADDR); extern void tui_get_begin_asm_address (struct gdbarch **, CORE_ADDR *); diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 27edc4ed29c..a72ba360185 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -97,7 +97,7 @@ tui_update_source_window_as_is (struct tui_source_window_base *win_info, ret = tui_set_source_content (win_info, s, line_or_addr.u.line_no, noerror); else - ret = tui_set_disassem_content (gdbarch, line_or_addr.u.addr); + ret = tui_set_disassem_content (win_info, gdbarch, line_or_addr.u.addr); if (ret == TUI_FAILURE) {