From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 34787 invoked by alias); 23 Jul 2017 19:57:10 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 34310 invoked by uid 89); 23 Jul 2017 19:57:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 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,RCVD_IN_SORBS_SPAM,SPF_PASS autolearn=ham version=3.3.2 spammy=dozens X-HELO: mail-lf0-f52.google.com Received: from mail-lf0-f52.google.com (HELO mail-lf0-f52.google.com) (209.85.215.52) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 23 Jul 2017 19:57:07 +0000 Received: by mail-lf0-f52.google.com with SMTP id t128so7481028lff.2 for ; Sun, 23 Jul 2017 12:57:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=4R8NCVVXtnUWhNGECLObEzuuRCqUh4wKxB4QkIybYrU=; b=RsMLxUSxKXmHHlqKwHxlpw/ctFW06szbJalEr7AYv/ACaP4Ns82GYB9sK0HlEnsSgO Mt/pUlIUApqwxuYnPR8lUZzyobfDltl6+lhti2CJcxSt0Nwv7TA+mzw38b4t9ItzEKi5 MEbqAfFePCc5Gttl3q7XdQ8Y38LvVftxxfOROrkqzp4Zu4Yw/1olAxd0L9wBUb54NZvj IsrEfBAl/94UpJdfSjHpwInpOg3U6MULj5uhEEfmF2lCbVXOFGpKpD5ZYtCznwfDpnlP RrxgF+IehbhAvElOV/SBOaMobvpk1X0lB+pedkcyU+FEydr04D0aQHZUQOAQYmLJMiM4 oMDQ== X-Gm-Message-State: AIVw110aDVcr+WjhqWSYext+D0bhnL1DuGyyC6IvI4jAaJponQLiMdGT qztAmIATH0ZnnRANiOE= X-Received: by 10.46.8.1 with SMTP id 1mr4585378lji.48.1500839824404; Sun, 23 Jul 2017 12:57:04 -0700 (PDT) Received: from [192.168.0.204] ([91.215.122.25]) by smtp.gmail.com with ESMTPSA id 2sm2062924lju.0.2017.07.23.12.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Jul 2017 12:57:03 -0700 (PDT) Subject: Re: [PING][PATCH] Align natural-format register values to the same column To: Simon Marchi Cc: gdb-patches@sourceware.org References: <1499607122-11131-1-git-send-email-b7.10110111@gmail.com> <7e394ecee6241eb437c8478bf618a2a7@polymtl.ca> From: Ruslan Kabatsayev Message-ID: Date: Sun, 23 Jul 2017 19:57:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux i686; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <7e394ecee6241eb437c8478bf618a2a7@polymtl.ca> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2017-07/txt/msg00341.txt.bz2 Hi Simon, On 23/07/17 22:46, Simon Marchi wrote: > Hi Ruslan, > > Thanks for the patch, it does indeed look pretty bad right now. > > If we are going to do the alignment by hand using spaces (which seems like a good idea, as it gives more control), I'd rather not keep the tab as an historic artifact. How many tests would have to be fixed, and how difficult would it be? > I'm not sure how many, because I can't possibly run tests for all the architectures. Also, there are many tests with intermittent failures (racy), which make counting harder even for a single arch. At first I did try to fix things for i386, but after fixing several dozens of lines of expected output I realized that it'll not fix anything for ARM etc., so I instead went with keeping the tab. >>> 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. Lots of tests in the test suite check for it, so this patch retains >>> the tab in the output after the second column. This allows these tests to >>> continue working unchanged. What is different is that now the tab may be >>> followed by several spaces, which complete the task of aligning the third >>> column when the sole tab doesn't work well. >>> >>> gdb/ChangeLog: >>> >>> * infcmd.c (default_print_one_register_info): Align natural- >>> format column value consistently one after another. >>> --- >>> gdb/infcmd.c | 27 ++++++++++++++++++--------- >>> 1 file changed, 18 insertions(+), 9 deletions(-) >>> >>> diff --git a/gdb/infcmd.c b/gdb/infcmd.c >>> index defa7b0..5de4e68 100644 >>> --- a/gdb/infcmd.c >>> +++ b/gdb/infcmd.c >>> @@ -2280,9 +2280,10 @@ default_print_one_register_info (struct ui_file *file, >>> { >>> struct type *regtype = value_type (val); >>> int print_raw_format; >>> + string_file format_stream; >>> >>> - fputs_filtered (name, file); >>> - print_spaces_filtered (15 - strlen (name), file); >>> + format_stream.puts (name); >>> + format_stream.puts (n_spaces (15 - strlen (name))); >>> >>> print_raw_format = (value_entirely_available (val) >>> && !value_optimized_out (val)); >>> @@ -2301,14 +2302,18 @@ 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, >>> + const int size_with_tab = format_stream.size () / 8 * 8 + 8; >>> + format_stream.putc ('\t'); >>> + if (size_with_tab < 32) >>> + format_stream.puts (n_spaces (32 - size_with_tab)); > > Could you extract that constant (32) to a const variable with some meaningful name? If we ever change the width, I predict that we'll forget to update the instances of the same 32 down there. Yeah, I can do this. But should the magic 15 above be named as well (as 32 is the second "tab stop" while 15 is the first one)? > > The padding could also be made into a small function to avoid repeating the code. > >>> + format_stream.puts ("(raw "); >>> + print_hex_chars (&format_stream, valaddr, TYPE_LENGTH (regtype), byte_order, >>> true); >>> - fprintf_filtered (file, ")"); >>> + format_stream.puts (")"); >>> } >>> } >>> else >>> @@ -2320,20 +2325,24 @@ 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) >>> { >>> + const int size_with_tab = format_stream.size () / 8 * 8 + 8; >>> + format_stream.putc ('\t'); >>> + if (size_with_tab < 32) >>> + format_stream.puts (n_spaces (32 - size_with_tab)); >>> 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"); >>> } >>> >>> > > Thanks! > > Simon Regards, Ruslan