From patchwork Tue Jan 16 19:13:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Farre X-Patchwork-Id: 84198 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 E885C385841F for ; Tue, 16 Jan 2024 19:14:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by sourceware.org (Postfix) with ESMTPS id 0938F3858C52 for ; Tue, 16 Jan 2024 19:13:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0938F3858C52 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 0938F3858C52 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::22b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705432417; cv=none; b=OvkYNFADGJ0n+TNmHOTzKXZT1wiR1VnG6jkhC23be000hhfgzQ7kBbRhsYQvrETsC/mQ+egV0IYRdLG3nG9L/pyvWDUYccYGnv34GKyUDNJBpRwvNEa+CQgMV28vWJBOKPGFS7kCM3sGoImohMfdmhfVOWyIxEIPSO34m1WpO+g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705432417; c=relaxed/simple; bh=WDnbb9Md/cUo9lJJlJpjxPUIfDsAvL6/qWgvd23uyZo=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=BKDIaGB6EbkUAIxP1qEvm/bBTeAnTXu1uSV6OH6KWeNcQkZchqvh9WdzFL7DLqPSAQAK1Whlowe0ih7jDh4vdE2KWOzi8l6VcpAwqoF5AuHUGkbj30JNLajoSVgSb2GvlZ0LpFsnEV8P/PxAyhEeXE4iZbXsD3fEind+eq8Lr20= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2cd1232a2c7so126865061fa.0 for ; Tue, 16 Jan 2024 11:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705432413; x=1706037213; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0Y8KiA4aEVKU/hyoNNhL3nxafghyUpxmZF4ZhY4iEis=; b=WZo50UeQbtZXh73UvKgTNdA7Snlm5eZqhjgo0KJx3032tkI0FMiTo6X3jkasgeLq2O r5hoNv/uRF+tzaB9OWejXPtFIe71P12aiNZEaU//YongyvWRnWw6NxNPdY3HDOwjQ5hI wBmz2Mhh07C0AAm5dqoqX67VSt0Rdn6RRgucieXHU1rE7rMK/VWtDuNAtG/MaOG28LQ+ em/bLkcapR7QCgZfiNHNwad610LDCmbs9ykrt+vuUNxTc37gxMB2tI8Z5vGw5e7J+hqO hTnQXqmN4PeNfC+bRSss3VStDah6H9RyetjAkp/LtvpaMLlCMqxuRfEsMcCz5sdhuyhW DhBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705432413; x=1706037213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0Y8KiA4aEVKU/hyoNNhL3nxafghyUpxmZF4ZhY4iEis=; b=FfOdDzlq3sMaplsmulr7oZKFoXxXx3EIyD9IcUM/5DMzHQSIinm4TP/2fHrPWgmbc0 oodHZX6bmxPxMICvqoc2qRXJuXn55N4ioBB+SXOs9ZcB+Cr+oHad4lKwdvzveu1u/L7L 04OzOolG8FETi/XQXvo63O6Pt11pIL+PJTpxsjPbEMWDnfkNJo0CndtPTua3t5ypxmsd p9Z2uLlB2LQCYTOdwcKtJl3aEu6z0MzW9hpAAe6Alw26HS2VKOYvZAO/2cMipLsj68xI BHmBNhpzpEZFBPUMVXN3sG6TwuvXzF6UWWU1/yKY8o8u3OXlekk5Ir6k733IhW81yQ8j wUag== X-Gm-Message-State: AOJu0YyCiBrGJVAX8/me05AQFVv1RisEM5l2WpdC5wkPTeqS4gmJubga 8H5Cgo2G0B/AFNHXE1r5fcsa6wcW0kg= X-Google-Smtp-Source: AGHT+IHU5dkJLkLCZJx84aIxGrJs+9pNDvl5SFS+5qbNdSh/GWLX/gHF67iSDdZOn7fLP3miLbVWkQ== X-Received: by 2002:a2e:5303:0:b0:2cc:f67e:3eef with SMTP id h3-20020a2e5303000000b002ccf67e3eefmr3130705ljb.77.1705432412880; Tue, 16 Jan 2024 11:13:32 -0800 (PST) Received: from localhost.localdomain ([2001:2044:7c:4b00:37f8:fc67:7f51:113d]) by smtp.gmail.com with ESMTPSA id u1-20020a2eb801000000b002cdc84fdef9sm630413ljo.89.2024.01.16.11.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 11:13:32 -0800 (PST) From: Simon Farre To: gdb-patches@sourceware.org Cc: Simon Farre Subject: [PATCH 2/5] [dap & linetable]: Add column to maint info linetable output Date: Tue, 16 Jan 2024 20:13:02 +0100 Message-ID: <20240116191305.126345-2-simon.farre.cx@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116191305.126345-1-simon.farre.cx@gmail.com> References: <20240116191305.126345-1-simon.farre.cx@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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 adds "COL" to the output of the maintenance command "info line-table" --- gdb/symmisc.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 5dfb9fca8f0..78dc63df6ac 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -973,9 +973,10 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data) /* Leave space for 6 digits of index and line number. After that the tables will just not format as well. */ struct ui_out *uiout = current_uiout; - ui_out_emit_table table_emitter (uiout, 7, -1, "line-table"); + ui_out_emit_table table_emitter (uiout, 8, -1, "line-table"); uiout->table_header (6, ui_left, "index", _("INDEX")); uiout->table_header (6, ui_left, "line", _("LINE")); + uiout->table_header (6, ui_left, "col", _("COL")); uiout->table_header (18, ui_left, "rel-address", _("REL-ADDRESS")); uiout->table_header (18, ui_left, "unrel-address", _("UNREL-ADDRESS")); uiout->table_header (7, ui_left, "is-stmt", _("IS-STMT")); @@ -991,9 +992,15 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data) ui_out_emit_tuple tuple_emitter (uiout, nullptr); uiout->field_signed ("index", i); if (item->line > 0) - uiout->field_signed ("line", item->line); + { + uiout->field_signed ("line", item->line); + uiout->field_signed("col", item->col); + } else - uiout->field_string ("line", _("END")); + { + uiout->field_string ("line", _("END")); + uiout->field_string ("col", _("END")); + } uiout->field_core_addr ("rel-address", objfile->arch (), item->pc (objfile)); uiout->field_core_addr ("unrel-address", objfile->arch (),