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 <main+16>
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));