From patchwork Sun Mar 3 18:43:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 86725 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 5D7D23858435 for ; Sun, 3 Mar 2024 18:43:59 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from omta38.uswest2.a.cloudfilter.net (omta38.uswest2.a.cloudfilter.net [35.89.44.37]) by sourceware.org (Postfix) with ESMTPS id 55DCB3858C66 for ; Sun, 3 Mar 2024 18:43:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 55DCB3858C66 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 55DCB3858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=35.89.44.37 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709491389; cv=none; b=Tq7iGbwiIByNaq4fHpeSkZY2TcdIAPCP3/awEzfkW2/EKegOFG2Gz/ojJGlUQmCIozhUcUT0HmOJhTLQuz442uwjFado0A/MwjuHPaWZzAcLqWHHUhiTCYJg82RqEdlDGxmZpWl2GycMYEtNaCuPM0mw41+b/eUCXk/Qsq0wOF4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1709491389; c=relaxed/simple; bh=dPpKqP6Cnh6bBxJ1obiCRM9+XtVEnNbb8xg52OLFcI4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=aOQt3hKUrNM3YUvNKaQHpIDOlQyt7oQ7NdSLnu50u4uyUXGm6yoJMt11xQjt8oohToZpDhi3dvvDX09qzVq0+UT7qnAN4Y59C757T0V/kMDLIL3v3r5aermzTNckkiQhNbK64JyWgM5zM3CWKY4US43cIweoJAHAnO1EIoZFEKQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id gVzfrNGFADI6fgqnirDgJv; Sun, 03 Mar 2024 18:43:06 +0000 Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTPS id gqnhrgk3FyGbngqnhrPsH2; Sun, 03 Mar 2024 18:43:05 +0000 X-Authority-Analysis: v=2.4 cv=FOsdxfos 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=d4jQeNvtND4_CaP5cJMA: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=GfNGzrz1jHQj4B8k+vgKx8J0B5uCdl4iWY9prgH/qBc=; b=rNdkfdccKq7jGr53qjBCU9Leo2 Rs7E7tKo43fG+vs4PKFrBirh6a3ueZU1zcx+aagz2gUqbayqrqxTSIZYtK+waCHpeJkVJ9VRqO7IO VtP1z5Qa0zjG9l94lBIv6MYHK; 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-3A for gdb-patches@sourceware.org; Sun, 03 Mar 2024 11:43:05 -0700 From: Tom Tromey Date: Sun, 03 Mar 2024 11:43:05 -0700 Subject: [PATCH v2 3/3] Use ui-out tables in linux-tdep.c MIME-Version: 1.0 Message-Id: <20240303-info-proc-ui-out-v2-3-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-3A 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: 4 X-Org: HG=bhshared;ORG=bluehost; X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfPZHLaNaCnec61LQZRomu/4DqVQ+PPCdDTuw1x4ZY34A0pfU1qgkNHCFI+18ksvBR7mXKHH6zQaH5aKGbtGcVy543elc33S7SgUHJuYuZL1dzog7rl4W D0HpM2TbcNzhbXNfqYUBjpkjK9/EgT5OEhEFJdEIUH8VKXwbAngzCKqyflbyM4DpGSBXNBdu9kTYZjBGQo2zvyzXha6h3hhV4Sg= X-Spam-Status: No, score=-3022.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, 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 a couple of spots in linux-tdep.c to use a ui-out table. It also changes the output to style the file names. --- gdb/linux-tdep.c | 114 ++++++++++++++++++++++--------------------------------- 1 file changed, 46 insertions(+), 68 deletions(-) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 701e3df7a27..4bac4d81abd 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -43,6 +43,7 @@ #include "gcore-elf.h" #include "solib-svr4.h" #include "memtag.h" +#include "cli/cli-style.h" #include #include @@ -457,7 +458,7 @@ struct mapping { ULONGEST addr; ULONGEST endaddr; - std::string_view permissions; + std::string permissions; ULONGEST offset; std::string_view device; ULONGEST inode; @@ -899,20 +900,19 @@ linux_info_proc (struct gdbarch *gdbarch, const char *args, { char *line; - gdb_printf (_("Mapped address spaces:\n\n")); - if (gdbarch_addr_bit (gdbarch) == 32) - { - gdb_printf ("\t%10s %10s %10s %10s %s %s\n", - "Start Addr", " End Addr", " Size", - " Offset", "Perms ", "objfile"); - } - else - { - gdb_printf (" %18s %18s %10s %10s %s %s\n", - "Start Addr", " End Addr", " Size", - " Offset", "Perms ", "objfile"); - } - + struct ui_out *uiout = current_uiout; + uiout->text (_("Mapped address spaces:\n\n")); + ui_out_emit_table table_emitter (uiout, 6, -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 (5, ui_right, "permissions", "Perms"); + uiout->table_header (10, ui_left, "objfile", "objfile"); + + uiout->table_body (); + ui_file_style filenames = file_name_style.style (); char *saveptr; for (line = strtok_r (map.get (), "\n", &saveptr); line; @@ -920,28 +920,14 @@ linux_info_proc (struct gdbarch *gdbarch, const char *args, { struct mapping m = read_mapping (line); - if (gdbarch_addr_bit (gdbarch) == 32) - { - gdb_printf ("\t%10s %10s %10s %10s %-5.*s %s\n", - paddress (gdbarch, m.addr), - paddress (gdbarch, m.endaddr), - hex_string (m.endaddr - m.addr), - hex_string (m.offset), - (int) m.permissions.size (), - m.permissions.data (), - m.filename); - } - else - { - gdb_printf (" %18s %18s %10s %10s %-5.*s %s\n", - paddress (gdbarch, m.addr), - paddress (gdbarch, m.endaddr), - hex_string (m.endaddr - m.addr), - hex_string (m.offset), - (int) m.permissions.size (), - m.permissions.data (), - m.filename); - } + ui_out_emit_tuple tuple_emitter (uiout, nullptr); + uiout->field_core_addr ("start", gdbarch, m.addr); + uiout->field_core_addr ("end", gdbarch, m.endaddr); + uiout->field_string ("size", hex_string (m.endaddr - m.addr)); + uiout->field_string ("offset", hex_string (m.offset)); + uiout->field_string ("permissions", m.permissions); + uiout->field_string ("objfile", m.filename, filenames); + uiout->text ("\n"); } } else @@ -1242,42 +1228,34 @@ linux_read_core_file_mappings static void linux_core_info_proc_mappings (struct gdbarch *gdbarch, const char *args) { + struct ui_out *uiout = current_uiout; + std::optional table_emitter; + ui_file_style filenames = file_name_style.style (); + linux_read_core_file_mappings (gdbarch, current_program_space->core_bfd (), - [=] (ULONGEST count) + [&] (ULONGEST count) { 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"); - } + table_emitter.emplace (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 (); }, - [=] (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, + [&] (int num, ULONGEST start, ULONGEST end, ULONGEST file_ofs, const char *filename, const bfd_build_id *build_id) { - 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"); }); } @@ -1390,7 +1368,7 @@ parse_smaps_data (const char *data, /* Decode permissions. */ auto has_perm = [&m] (char c) - { return m.permissions.find (c) != std::string_view::npos; }; + { return m.permissions.find (c) != std::string::npos; }; read = has_perm ('r'); write = has_perm ('w'); exec = has_perm ('x');