From patchwork Fri Jan 19 07:22:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruslan Kabatsayev X-Patchwork-Id: 25449 Received: (qmail 87008 invoked by alias); 19 Jan 2018 07:22:44 -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 86998 invoked by uid 89); 19 Jan 2018 07:22:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-lf0-f67.google.com Received: from mail-lf0-f67.google.com (HELO mail-lf0-f67.google.com) (209.85.215.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 19 Jan 2018 07:22:41 +0000 Received: by mail-lf0-f67.google.com with SMTP id o89so900652lfg.10 for ; Thu, 18 Jan 2018 23:22:41 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=kmlI+LXzRUXSMpaM/+YHqQwnGD2qtrzSo1jJi/y6aS8=; b=IZJPPqDksRpauh6lCqyPi/e824rz7jSWSZ+3Id7VQnzukhv1yRJi8xAYDnFKZIzDGx 7lQcRGf0OEwbUxszBQ15qsF1ZrZkAu8yilAVhnIKWNMS+gWBEqlENo4D5yBhnA/o1b2+ ol8RC3YfifpmZaxhbHbDNRNfOKkKnmm+DOwSHSlbmuqdvNEzOjBz2i4Xb2aCMgNnRKk+ LmBUDeiit0/Z0BivJaNsFomG4VT9JEHtldOHrLPW+JfzU/RcgP6OYZQUQNtR7aniteJv jTDLLh4Vu8ewiXalgIc46sdPFLj3l3H9NOWcxojAyTgepRsLr6imdioZzzElEJABmusr DWkA== X-Gm-Message-State: AKwxytcrZ79TgbYo0Mk9Q6JQB4ZzfFehefKNom2rUzqm4w4mTdajUKTd llXWu2kS9nvPMuYM+8Kx2u8vmA== X-Google-Smtp-Source: ACJfBovFERw5I+DCosqKuWQfP2JlTxsqAHb2t0qpMfjQKPDjndYOHMogueJeIkKkK+INfbzi4mj/Ow== X-Received: by 10.46.8.89 with SMTP id g25mr4471170ljd.47.1516346559035; Thu, 18 Jan 2018 23:22:39 -0800 (PST) Received: from localhost.localdomain ([91.215.122.25]) by smtp.gmail.com with ESMTPSA id a29sm1594601ljd.32.2018.01.18.23.22.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Jan 2018 23:22:37 -0800 (PST) From: Ruslan Kabatsayev To: gdb-patches@sourceware.org Cc: Ruslan Kabatsayev Subject: [PATCH v3] Align natural-format register values to the same column Date: Fri, 19 Jan 2018 10:22:25 +0300 Message-Id: <1516346545-8217-1-git-send-email-b7.10110111@gmail.com> X-IsSubscribed: yes Currently, commands such as "info reg", "info all-reg", as well as register window in the TUI print badly aligned columns, like here: eax 0x1 1 ecx 0xffffd3e0 -11296 edx 0xffffd404 -11260 ebx 0xf7fa5ff4 -134586380 esp 0xffffd390 0xffffd390 ebp 0xffffd3c8 0xffffd3c8 esi 0x0 0 edi 0x0 0 eip 0x8048b60 0x8048b60 eflags 0x286 [ PF SF IF ] cs 0x23 35 ss 0x2b 43 ds 0x2b 43 es 0x2b 43 fs 0x0 0 gs 0x63 99 After this patch, these commands print the third column values consistently aligned one under another, provided the second column is not too long. Originally, the third column was (attempted to be) aligned using a simple tab character. This patch changes the alignment to spaces only. The tests checking the output and expecting the single tab have been fixed in a previous patch, so this change doesn't break any. gdb/ChangeLog: * infcmd.c (default_print_one_register_info): Align natural-format column values consistently one under another. --- gdb/infcmd.c | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 976276b..c59a8f8 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -2283,6 +2283,15 @@ path_command (const char *dirname, int from_tty) } +static void +pad_to_column (string_file& stream, int col) +{ + stream.putc (' '); /* at least one space must be printed to separate columns */ + const int size = stream.size (); + if (size < col) + stream.puts (n_spaces (col - size)); +} + /* Print out the register NAME with value VAL, to FILE, in the default fashion. */ @@ -2293,9 +2302,17 @@ default_print_one_register_info (struct ui_file *file, { struct type *regtype = value_type (val); int print_raw_format; + string_file format_stream; + enum tab_stops + { + value_column_1 = 15, + /* Give enough room for "0x", 16 hex digits and two spaces in + preceding column. */ + value_column_2 = value_column_1+2+16+2, + }; - fputs_filtered (name, file); - print_spaces_filtered (15 - strlen (name), file); + format_stream.puts (name); + format_stream.puts (n_spaces (value_column_1 - strlen (name))); print_raw_format = (value_entirely_available (val) && !value_optimized_out (val)); @@ -2314,14 +2331,15 @@ default_print_one_register_info (struct ui_file *file, val_print (regtype, value_embedded_offset (val), 0, - file, 0, val, &opts, current_language); + &format_stream, 0, val, &opts, current_language); if (print_raw_format) { - fprintf_filtered (file, "\t(raw "); - print_hex_chars (file, valaddr, TYPE_LENGTH (regtype), byte_order, + pad_to_column (format_stream, value_column_2); + format_stream.puts ("(raw "); + print_hex_chars (&format_stream, valaddr, TYPE_LENGTH (regtype), byte_order, true); - fprintf_filtered (file, ")"); + format_stream.puts (")"); } } else @@ -2333,20 +2351,21 @@ default_print_one_register_info (struct ui_file *file, opts.deref_ref = 1; val_print (regtype, value_embedded_offset (val), 0, - file, 0, val, &opts, current_language); + &format_stream, 0, val, &opts, current_language); /* If not a vector register, print it also according to its natural format. */ if (print_raw_format && TYPE_VECTOR (regtype) == 0) { + pad_to_column (format_stream, value_column_2); get_user_print_options (&opts); opts.deref_ref = 1; - fprintf_filtered (file, "\t"); val_print (regtype, value_embedded_offset (val), 0, - file, 0, val, &opts, current_language); + &format_stream, 0, val, &opts, current_language); } } + fputs_filtered (format_stream.c_str (), file); fprintf_filtered (file, "\n"); }