public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
From: jkratoch@sourceware.org
To: archer-commits@sourceware.org
Subject: [SCM] users/jkratoch/dwarf5gcc-gdb: Merge branch 'dwarf5gcc-readelf-gdb-callsite-macro' into dwarf5gcc-readelf-gdb-callsite-macro-data16
Date: Wed, 23 Nov 2016 23:04:00 -0000 [thread overview]
Message-ID: <20161123230400.63583.qmail@sourceware.org> (raw)
The branch, users/jkratoch/dwarf5gcc-gdb has been updated
via 22d3c13be5c0e4fe2f3896659e642c1b8aec2086 (commit)
via 5be8c128cf14f1115c970b115167c8ad4f4023fb (commit)
via ba3665e5ee6c5556530f2449992e56e6e13a130a (commit)
via 770f6cdee646ade3aa0efc1ad598fa71ed612f3a (commit)
via 073178f5c08919859722f52604a85c1a30e21b5c (commit)
from 0bbcf0c2b8370a7017bb066e672d213998cf7fc0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 22d3c13be5c0e4fe2f3896659e642c1b8aec2086
Merge: 0bbcf0c 5be8c12
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Nov 24 00:03:27 2016 +0100
Merge branch 'dwarf5gcc-readelf-gdb-callsite-macro' into dwarf5gcc-readelf-gdb-callsite-macro-data16
commit 5be8c128cf14f1115c970b115167c8ad4f4023fb
Merge: 917a171 ba3665e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Nov 24 00:03:27 2016 +0100
Merge branch 'dwarf5gcc-readelf-gdb-callsite' into dwarf5gcc-readelf-gdb-callsite-macro
commit ba3665e5ee6c5556530f2449992e56e6e13a130a
Merge: d8867e1 770f6cd
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Nov 24 00:03:26 2016 +0100
Merge branch 'dwarf5gcc-readelf-gdb' into dwarf5gcc-readelf-gdb-callsite
commit 770f6cdee646ade3aa0efc1ad598fa71ed612f3a
Merge: 4ada4bd 073178f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Thu Nov 24 00:03:18 2016 +0100
Merge branch 'dwarf5gcc-readelf' into dwarf5gcc-readelf-gdb
commit 073178f5c08919859722f52604a85c1a30e21b5c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Nov 23 23:33:08 2016 +0100
.
-----------------------------------------------------------------------
Summary of changes:
binutils/dwarf.c | 61 ++++++++++++++++++++++++++---------------------------
1 files changed, 30 insertions(+), 31 deletions(-)
First 500 lines of diff:
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 4101d8a..4ede608 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -901,11 +901,11 @@ get_FORM_name (unsigned long form)
static unsigned char *
display_block (unsigned char *data,
dwarf_vma length,
- const unsigned char * const end)
+ const unsigned char * const end, char delimiter)
{
dwarf_vma maxlen;
- printf (_(" %s byte block: "), dwarf_vmatoa ("u", length));
+ printf (_("%c%s byte block: "), delimiter, dwarf_vmatoa ("u", length));
if (data > end)
return (unsigned char *) end;
@@ -1298,7 +1298,7 @@ decode_location_expression (unsigned char * data,
printf ("DW_OP_implicit_value");
uvalue = read_uleb128 (data, &bytes_read, end);
data += bytes_read;
- data = display_block (data, uvalue, end);
+ data = display_block (data, uvalue, end, ' ');
break;
/* GNU extensions. */
@@ -1378,7 +1378,7 @@ decode_location_expression (unsigned char * data,
: "DW_OP_GNU_const_type"),
dwarf_vmatoa ("x", cu_offset + uvalue));
SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
- data = display_block (data, uvalue, end);
+ data = display_block (data, uvalue, end, ' ');
break;
case DW_OP_regval_type:
case DW_OP_GNU_regval_type:
@@ -1562,7 +1562,7 @@ read_and_display_attr_value (unsigned long attribute,
debug_info * debug_info_p,
int do_loc,
struct dwarf_section * section,
- struct cu_tu_set * this_set)
+ struct cu_tu_set * this_set, char delimiter)
{
dwarf_vma uvalue = 0;
unsigned char *block_start = NULL;
@@ -1642,7 +1642,7 @@ read_and_display_attr_value (unsigned long attribute,
form = read_uleb128 (data, & bytes_read, end);
data += bytes_read;
if (!do_loc)
- printf (" %s", get_FORM_name (form));
+ printf ("%c%s", delimiter, get_FORM_name (form));
if (form == DW_FORM_implicit_const)
{
implicit_const = read_sleb128 (data, & bytes_read, end);
@@ -1652,7 +1652,7 @@ read_and_display_attr_value (unsigned long attribute,
end, cu_offset, pointer_size,
offset_size, dwarf_version,
debug_info_p, do_loc,
- section, this_set);
+ section, this_set, delimiter);
case DW_FORM_GNU_addr_index:
uvalue = read_uleb128 (data, & bytes_read, end);
data += bytes_read;
@@ -1663,12 +1663,12 @@ read_and_display_attr_value (unsigned long attribute,
{
case DW_FORM_ref_addr:
if (!do_loc)
- printf (" <0x%s>", dwarf_vmatoa ("x",uvalue));
+ printf ("%c<0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
break;
case DW_FORM_GNU_ref_alt:
if (!do_loc)
- printf (" <alt 0x%s>", dwarf_vmatoa ("x",uvalue));
+ printf ("%c<alt 0x%s>", delimiter, dwarf_vmatoa ("x",uvalue));
break;
case DW_FORM_ref1:
@@ -1676,14 +1676,14 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_ref4:
case DW_FORM_ref_udata:
if (!do_loc)
- printf (" <0x%s>", dwarf_vmatoa ("x", uvalue + cu_offset));
+ printf ("%c<0x%s>", delimiter, dwarf_vmatoa ("x", uvalue + cu_offset));
break;
case DW_FORM_data4:
case DW_FORM_addr:
case DW_FORM_sec_offset:
if (!do_loc)
- printf (" 0x%s", dwarf_vmatoa ("x", uvalue));
+ printf ("%c0x%s", delimiter, dwarf_vmatoa ("x", uvalue));
break;
case DW_FORM_flag_present:
@@ -1693,12 +1693,12 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_sdata:
case DW_FORM_udata:
if (!do_loc)
- printf (" %s", dwarf_vmatoa ("d", uvalue));
+ printf ("%c%s", delimiter, dwarf_vmatoa ("d", uvalue));
break;
case DW_FORM_implicit_const:
if (!do_loc)
- printf (" %s", dwarf_vmatoa ("d", implicit_const));
+ printf ("%c%s", delimiter, dwarf_vmatoa ("d", implicit_const));
break;
case DW_FORM_ref8:
@@ -1713,7 +1713,7 @@ read_and_display_attr_value (unsigned long attribute,
utmp = uvalue;
if (form == DW_FORM_ref8)
add64 (& high_bits, & utmp, cu_offset);
- printf (" 0x%s",
+ printf ("%c0x%s", delimiter,
dwarf_vmatoa64 (high_bits, utmp, buf, sizeof (buf)));
}
@@ -1757,7 +1757,7 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_string:
if (!do_loc)
- printf (" %.*s", (int) (end - data), data);
+ printf ("%c%.*s", delimiter, (int) (end - data), data);
data += strnlen ((char *) data, end - data) + 1;
break;
@@ -1784,7 +1784,7 @@ read_and_display_attr_value (unsigned long attribute,
if (do_loc)
data = block_start + uvalue;
else
- data = display_block (block_start, uvalue, end);
+ data = display_block (block_start, uvalue, end, delimiter);
break;
case DW_FORM_block1:
@@ -1805,7 +1805,7 @@ read_and_display_attr_value (unsigned long attribute,
if (do_loc)
data = block_start + uvalue;
else
- data = display_block (block_start, uvalue, end);
+ data = display_block (block_start, uvalue, end, delimiter);
break;
case DW_FORM_block2:
@@ -1826,7 +1826,7 @@ read_and_display_attr_value (unsigned long attribute,
if (do_loc)
data = block_start + uvalue;
else
- data = display_block (block_start, uvalue, end);
+ data = display_block (block_start, uvalue, end, delimiter);
break;
case DW_FORM_block4:
@@ -1850,19 +1850,19 @@ read_and_display_attr_value (unsigned long attribute,
if (do_loc)
data = block_start + uvalue;
else
- data = display_block (block_start, uvalue, end);
+ data = display_block (block_start, uvalue, end, delimiter);
break;
case DW_FORM_strp:
if (!do_loc)
- printf (_(" (indirect string, offset: 0x%s): %s"),
+ printf (_("%c(indirect string, offset: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
fetch_indirect_string (uvalue));
break;
case DW_FORM_line_strp:
if (!do_loc)
- printf (_(" (indirect line string, offset: 0x%s): %s"),
+ printf (_("%c(indirect line string, offset: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
fetch_indirect_line_string (uvalue));
break;
@@ -1873,7 +1873,7 @@ read_and_display_attr_value (unsigned long attribute,
const char *suffix = strrchr (section->name, '.');
int dwo = (suffix && strcmp (suffix, ".dwo") == 0) ? 1 : 0;
- printf (_(" (indexed string: 0x%s): %s"),
+ printf (_("%c(indexed string: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
fetch_indexed_string (uvalue, this_set, offset_size, dwo));
}
@@ -1881,7 +1881,7 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_GNU_strp_alt:
if (!do_loc)
- printf (_(" (alt indirect string, offset: 0x%s)"),
+ printf (_("%c(alt indirect string, offset: 0x%s)"), delimiter,
dwarf_vmatoa ("x", uvalue));
break;
@@ -1896,7 +1896,7 @@ read_and_display_attr_value (unsigned long attribute,
char buf[64];
SAFE_BYTE_GET64 (data, &high_bits, &uvalue, end);
- printf (" signature: 0x%s",
+ printf ("%csignature: 0x%s", delimiter,
dwarf_vmatoa64 (high_bits, uvalue, buf, sizeof (buf)));
}
data += 8;
@@ -1904,7 +1904,7 @@ read_and_display_attr_value (unsigned long attribute,
case DW_FORM_GNU_addr_index:
if (!do_loc)
- printf (_(" (addr_index: 0x%s): %s"),
+ printf (_("%c(addr_index: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
fetch_indexed_value (uvalue * pointer_size, pointer_size));
break;
@@ -2340,7 +2340,7 @@ read_and_display_attr (unsigned long attribute,
data = read_and_display_attr_value (attribute, form, implicit_const, data, end,
cu_offset, pointer_size, offset_size,
dwarf_version, debug_info_p,
- do_loc, section, this_set);
+ do_loc, section, this_set, ' ');
if (!do_loc)
printf ("\n");
return data;
@@ -3077,11 +3077,10 @@ display_formatted_table (unsigned char *data,
format += bytes_read;
form = read_uleb128 (format, & bytes_read, end);
format += bytes_read;
- putchar ('\t');
data = read_and_display_attr_value (0, form, 0, data, end, 0, 0,
linfo->li_offset_size,
linfo->li_version, NULL, 0,
- section, NULL);
+ section, NULL, '\t');
}
if (data == end)
{
@@ -3610,7 +3609,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
linfo.li_offset_size,
linfo.li_version,
NULL, 1, section,
- NULL);
+ NULL, '\t');
}
if (data == end)
{
@@ -3700,7 +3699,7 @@ display_debug_lines_decoded (struct dwarf_section *section,
linfo.li_offset_size,
linfo.li_version,
NULL, 1, section,
- NULL);
+ NULL, '\t');
}
if (data == end)
{
@@ -4785,7 +4784,7 @@ display_debug_macro (struct dwarf_section *section,
= read_and_display_attr_value (0, val, 0,
curr, end, 0, 0, offset_size,
version, NULL, 0, NULL,
- NULL);
+ NULL, ' ');
if (n != nargs - 1)
printf (",");
}
hooks/post-receive
--
Repository for Project Archer.
next reply other threads:[~2016-11-23 23:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-23 23:04 jkratoch [this message]
2016-11-28 20:20 jkratoch
2016-12-17 15:05 jkratoch
2016-12-24 20:30 jkratoch
2017-01-02 21:49 jkratoch
2017-01-05 19:35 jkratoch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161123230400.63583.qmail@sourceware.org \
--to=jkratoch@sourceware.org \
--cc=archer-commits@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).