From patchwork Sun Mar 3 18:43:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 86724 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 297E8385842C for ; Sun, 3 Mar 2024 18:43:35 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta036.useast.a.cloudfilter.net (omta036.useast.a.cloudfilter.net [44.202.169.35]) by sourceware.org (Postfix) with ESMTPS id D99BB3858C55 for ; Sun, 3 Mar 2024 18:43:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D99BB3858C55 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D99BB3858C55 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=44.202.169.35 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709491389; cv=none; b=mNnLzhGz3iN0JHT8WaSQmP0pys0TIe/R87eD3C0CY2WLRTKcN3w22kxDRZuoGEboTbyn9Ug2yTGn1Kre6FtuoIM+5blEgdndW7LBuUv0GduMGteCNy4vk8SKgLr0DS23X53QiNhPC5F4/Zb0pUHdPzkrefPVKMOkIX5knUuHUIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709491389; c=relaxed/simple; bh=W+g6Z15r+wYa7MiAo1AZkMAsUaQWH6388D52Q2aj9ps=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=E0xaR537gAtzIJoo1LEwA0YKqtQ3NGDY1ROSC6sy5u4hhf16jUc1CVwE/9olkmBhfKcnBd3s35SGDZDyJJEJj8FEAGn42yRoTPuEZRgKuLbMUormLGxZn+xVGD6tCu9giyF9wZaL+4+Vl77MswXh3smCn2dNxko1t5QMAb0jkT0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-6006a.ext.cloudfilter.net ([10.0.30.182]) by cmsmtp with ESMTPS id gbqZr0Nn6uh6sgqniryP5x; Sun, 03 Mar 2024 18:43:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id gqnhrJCxLlhJmgqnhrT9EE; Sun, 03 Mar 2024 18:43:05 +0000 X-Authority-Analysis: v=2.4 cv=OIch3zaB c=1 sm=1 tr=0 ts=65e4c4b9 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=IkcTkHD0fZMA:10 a=K6JAEmCyrfEA:10 a=Qbun_eYptAEA:10 a=-QOirb2pPFJ2DxacaEQA:9 a=QEXdDO2ut3YA:10 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=kKI30n0rI3rDYZNaUwEcSj07I5MCfmRMbquv/xOwEe8=; b=e65U6/EA//LGLNKMUKS/zYkfbb But96IP4Rfrs4XG8WRKMiS/xUyym09UeqUAdUPQwrt+ARQ13qeTOdvZO9XbwNmXBUzHk+82o35Nee +202PzdlShiwWelYaVAGgHpg2; Received: from 71-211-170-195.hlrn.qwest.net ([71.211.170.195]:40354 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96.2) (envelope-from ) id 1rgqng-003gi2-2c for gdb-patches@sourceware.org; Sun, 03 Mar 2024 11:43:04 -0700 From: Tom Tromey Date: Sun, 03 Mar 2024 11:43:04 -0700 Subject: [PATCH v2 2/3] Use ui-out in core_target::info_proc_mappings MIME-Version: 1.0 Message-Id: <20240303-info-proc-ui-out-v2-2-cf3d2013b33e@tromey.com> References: <20240303-info-proc-ui-out-v2-0-cf3d2013b33e@tromey.com> In-Reply-To: <20240303-info-proc-ui-out-v2-0-cf3d2013b33e@tromey.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 71.211.170.195 X-Source-L: No X-Exim-ID: 1rgqng-003gi2-2c X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 71-211-170-195.hlrn.qwest.net ([192.168.0.21]) [71.211.170.195]:40354 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfL0GXKlnvgU7kNmdIl9EVj/9p1Mlqnt6doNLXZ8MMQVXd9EtUmd5KoKh/oFmO+x/Myl2QZp+bu6p9OrXVj9sg97cripZn3eZVgBDK9slCrLwcFqOMksy WZ93d4LRwea3TAYi00D6/tOa3FD67LJayXhlMrvrrHwbrl53dJFWViwlXhdMj5Fajs6A+rh5TE8FT2chwBrDrva8CwpFRVnYrmY= X-Spam-Status: No, score=-3022.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org This changes core_target::info_proc_mappings to use a ui-out table. It also changes the output to style the file names. --- gdb/corelow.c | 54 ++++++++++++++++++++++-------------------------------- 1 file changed, 22 insertions(+), 32 deletions(-) diff --git a/gdb/corelow.c b/gdb/corelow.c index f291b2aba19..5c9268efa24 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -54,6 +54,7 @@ #include "gdbcmd.h" #include "xml-tdesc.h" #include "memtag.h" +#include "cli/cli-style.h" #ifndef O_LARGEFILE #define O_LARGEFILE 0 @@ -1444,25 +1445,21 @@ get_current_core_target () void core_target::info_proc_mappings (struct gdbarch *gdbarch) { - if (!m_core_file_mappings.empty ()) - { - gdb_printf (_("Mapped address spaces:\n\n")); - if (gdbarch_addr_bit (gdbarch) == 32) - { - gdb_printf ("\t%10s %10s %10s %10s %s\n", - "Start Addr", - " End Addr", - " Size", " Offset", "objfile"); - } - else - { - gdb_printf (" %18s %18s %10s %10s %s\n", - "Start Addr", - " End Addr", - " Size", " Offset", "objfile"); - } - } + if (m_core_file_mappings.empty ()) + return; + struct ui_out *uiout = current_uiout; + uiout->text (_("Mapped address spaces:\n\n")); + ui_out_emit_table table_emitter (uiout, 5, -1, "mappings"); + int width = gdbarch_addr_bit (gdbarch) == 32 ? 10 : 18; + uiout->table_header (width, ui_right, "start", "Start Addr"); + uiout->table_header (width, ui_right, "end", "End Addr"); + uiout->table_header (10, ui_right, "size", "Size"); + uiout->table_header (10, ui_right, "offset", "Offset"); + uiout->table_header (10, ui_left, "objfile", "objfile"); + + uiout->table_body (); + ui_file_style filenames = file_name_style.style (); for (const target_section &tsp : m_core_file_mappings) { ULONGEST start = tsp.addr; @@ -1470,20 +1467,13 @@ core_target::info_proc_mappings (struct gdbarch *gdbarch) ULONGEST file_ofs = tsp.the_bfd_section->filepos; const char *filename = bfd_get_filename (tsp.the_bfd_section->owner); - if (gdbarch_addr_bit (gdbarch) == 32) - gdb_printf ("\t%10s %10s %10s %10s %s\n", - paddress (gdbarch, start), - paddress (gdbarch, end), - hex_string (end - start), - hex_string (file_ofs), - filename); - else - gdb_printf (" %18s %18s %10s %10s %s\n", - paddress (gdbarch, start), - paddress (gdbarch, end), - hex_string (end - start), - hex_string (file_ofs), - filename); + ui_out_emit_tuple tuple_emitter (uiout, nullptr); + uiout->field_core_addr ("start", gdbarch, start); + uiout->field_core_addr ("end", gdbarch, end); + uiout->field_string ("size", hex_string (end - start)); + uiout->field_string ("offset", hex_string (file_ofs)); + uiout->field_string ("objfile", filename, filenames); + uiout->text ("\n"); } }