OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add --decompress option to readelf to decompress sections before they are dumped.

Browse Source 
bin	* readelf.c (options): Add "decompress".
	(usage): Mention -z/--decompress.
	(parse_args): Handle -z.
	(uncompress_section_contents): Move to earlier in the file.
	(dump_section_as_strings): If requested, decompress the section
	before dumping.
	(dump_section_as_bytes): Likewise.
	* doc/binutils.texi: Document the new option.

tests	* binutils-all/z.s: New test.  Checks the --decompress option to
	readelf.
	* binutils-all/readelf.exp: Run the test.
	* binutils-all/readelf.z: Expected output from readelf.
This commit is contained in:
Nick Clifton 2015-05-15 17:16:31 +01:00
parent 4e63d0ac89
commit 0e602686df
7 changed files with 406 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binutils/ChangeLog
View File

@ -1,3 +1,14 @@
2015-05-15 Nick Clifton <nickc@redhat.com>
* readelf.c (options): Add "decompress".
(usage): Mention -z/--decompress.
(parse_args): Handle -z.
(uncompress_section_contents): Move to earlier in the file.
(dump_section_as_strings): If requested, decompress the section
before dumping.
(dump_section_as_bytes): Likewise.
* doc/binutils.texi: Document the new option.
2015-05-14 Peter Bergner <bergner@vnet.ibm.com>
* MAINTAINERS: Add myself as PPC maintainer.

7
binutils/doc/binutils.texi
View File

@ -4344,6 +4344,7 @@ readelf [@option{-a}|@option{--all}]
[@option{-x} <number or name>|@option{--hex-dump=}<number or name>]
[@option{-p} <number or name>|@option{--string-dump=}<number or name>]
[@option{-R} <number or name>|@option{--relocated-dump=}<number or name>]
[@option{-z}|@option{--decompress}]
[@option{-c}|@option{--archive-index}]
[@option{-w[lLiaprmfFsoRt]}|
@option{--debug-dump}[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=frames-interp,=str,=loc,=Ranges,=pubtypes,=trace_info,=trace_abbrev,=trace_aranges,=gdb_index]]
@ -4492,6 +4493,12 @@ Displays the contents of the indicated section as printable strings.
A number identifies a particular section by index in the section table;
any other string identifies all sections with that name in the object file.
@item -z
@itemx --decompress
Requests that the section(s) being dumped by @option{x}, @option{R} or
@option{p} options are decompressed before being displayed. If the
section(s) are not compressed then they are displayed as is.
@item -c
@itemx --archive-index
@cindex Archive file symbol index information

445
binutils/readelf.c
View File

@ -209,6 +209,7 @@ static int do_arch;
static int do_notes;
static int do_archive_index;
static int is_32bit_elf;
static int decompress_dumps;
struct group_list
{
@ -3960,6 +3961,7 @@ static struct option options[] =
{"hex-dump", required_argument, 0, 'x'},
{"relocated-dump", required_argument, 0, 'R'},
{"string-dump", required_argument, 0, 'p'},
{"decompress", no_argument, 0, 'z'},
#ifdef SUPPORT_DISASSEMBLY
{"instruction-dump", required_argument, 0, 'i'},
#endif
@ -4007,6 +4009,7 @@ usage (FILE * stream)
Dump the contents of section <number|name> as strings\n\
-R --relocated-dump=<number|name>\n\
Dump the contents of section <number|name> as relocated bytes\n\
-z --decompress Decompress section before dumping it\n\
-w[lLiaprmfFsoRt] or\n\
--debug-dump[=rawline,=decodedline,=info,=abbrev,=pubnames,=aranges,=macro,=frames,\n\
=frames-interp,=str,=loc,=Ranges,=pubtypes,\n\
@ -4117,7 +4120,7 @@ parse_args (int argc, char ** argv)
usage (stderr);
while ((c = getopt_long
(argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:", options, NULL)) != EOF)
(argc, argv, "ADHINR:SVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF)
{
switch (c)
{
@ -4200,6 +4203,9 @@ parse_args (int argc, char ** argv)
case 'R':
request_dump (RELOC_DUMP);
break;
case 'z':
decompress_dumps++;
break;
case 'w':
do_dump++;
if (optarg == 0)
@ -11939,181 +11945,9 @@ get_section_contents (Elf_Internal_Shdr * section, FILE * file)
_("section contents"));
}
static void
dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
{
Elf_Internal_Shdr * relsec;
bfd_size_type num_bytes;
char * data;
char * end;
char * start;
bfd_boolean some_strings_shown;
start = get_section_contents (section, file);
if (start == NULL)
return;
printf (_("\nString dump of section '%s':\n"), printable_section_name (section));
/* If the section being dumped has relocations against it the user might
be expecting these relocations to have been applied. Check for this
case and issue a warning message in order to avoid confusion.
FIXME: Maybe we ought to have an option that dumps a section with
relocs applied ? */
for (relsec = section_headers;
relsec < section_headers + elf_header.e_shnum;
++relsec)
{
if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL)
|| relsec->sh_info >= elf_header.e_shnum
|| section_headers + relsec->sh_info != section
|| relsec->sh_size == 0
|| relsec->sh_link >= elf_header.e_shnum)
continue;
printf (_(" Note: This section has relocations against it, but these have NOT been applied to this dump.\n"));
break;
}
num_bytes = section->sh_size;
data = start;
end = start + num_bytes;
some_strings_shown = FALSE;
while (data < end)
{
while (!ISPRINT (* data))
if (++ data >= end)
break;
if (data < end)
{
size_t maxlen = end - data;
#ifndef __MSVCRT__
/* PR 11128: Use two separate invocations in order to work
around bugs in the Solaris 8 implementation of printf. */
printf (" [%6tx] ", data - start);
#else
printf (" [%6Ix] ", (size_t) (data - start));
#endif
if (maxlen > 0)
{
print_symbol ((int) maxlen, data);
putchar ('\n');
data += strnlen (data, maxlen);
}
else
{
printf (_("<corrupt>\n"));
data = end;
}
some_strings_shown = TRUE;
}
}
if (! some_strings_shown)
printf (_(" No strings found in this section."));
free (start);
putchar ('\n');
}
static void
dump_section_as_bytes (Elf_Internal_Shdr * section,
FILE * file,
bfd_boolean relocate)
{
Elf_Internal_Shdr * relsec;
bfd_size_type bytes;
bfd_vma addr;
unsigned char * data;
unsigned char * start;
start = (unsigned char *) get_section_contents (section, file);
if (start == NULL)
return;
printf (_("\nHex dump of section '%s':\n"), printable_section_name (section));
if (relocate)
{
apply_relocations (file, section, start, section->sh_size, NULL, NULL);
}
else
{
/* If the section being dumped has relocations against it the user might
be expecting these relocations to have been applied. Check for this
case and issue a warning message in order to avoid confusion.
FIXME: Maybe we ought to have an option that dumps a section with
relocs applied ? */
for (relsec = section_headers;
relsec < section_headers + elf_header.e_shnum;
++relsec)
{
if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL)
|| relsec->sh_info >= elf_header.e_shnum
|| section_headers + relsec->sh_info != section
|| relsec->sh_size == 0
|| relsec->sh_link >= elf_header.e_shnum)
continue;
printf (_(" NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"));
break;
}
}
addr = section->sh_addr;
bytes = section->sh_size;
data = start;
while (bytes)
{
int j;
int k;
int lbytes;
lbytes = (bytes > 16 ? 16 : bytes);
printf (" 0x%8.8lx ", (unsigned long) addr);
for (j = 0; j < 16; j++)
{
if (j < lbytes)
printf ("%2.2x", data[j]);
else
printf (" ");
if ((j & 3) == 3)
printf (" ");
}
for (j = 0; j < lbytes; j++)
{
k = data[j];
if (k >= ' ' && k < 0x7f)
printf ("%c", k);
else
printf (".");
}
putchar ('\n');
data += lbytes;
addr += lbytes;
bytes -= lbytes;
}
free (start);
putchar ('\n');
}
/* Uncompresses a section that was compressed using zlib, in place. */
static int
static bfd_boolean
uncompress_section_contents (unsigned char **buffer,
dwarf_size_type uncompressed_size,
dwarf_size_type *size)
@ -12156,13 +11990,272 @@ uncompress_section_contents (unsigned char **buffer,
*buffer = uncompressed_buffer;
*size = uncompressed_size;
return 1;
return TRUE;
fail:
free (uncompressed_buffer);
/* Indicate decompression failure. */
*buffer = NULL;
return 0;
return FALSE;
}
static void
dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file)
{
Elf_Internal_Shdr * relsec;
bfd_size_type num_bytes;
char * data;
char * end;
char * real_start;
char * start;
bfd_boolean some_strings_shown;
real_start = start = get_section_contents (section, file);
if (start == NULL)
return;
num_bytes = section->sh_size;
printf (_("\nString dump of section '%s':\n"), printable_section_name (section));
if (decompress_dumps)
{
dwarf_size_type new_size = num_bytes;
dwarf_size_type uncompressed_size = 0;
if ((section->sh_flags & SHF_COMPRESSED) != 0)
{
Elf_Internal_Chdr chdr;
unsigned int compression_header_size
= get_compression_header (& chdr, (unsigned char *) start);
if (chdr.ch_type == ELFCOMPRESS_ZLIB
&& chdr.ch_addralign == section->sh_addralign)
{
uncompressed_size = chdr.ch_size;
start += compression_header_size;
new_size -= compression_header_size;
}
}
else if (new_size > 12 && streq ((char *) start, "ZLIB"))
{
/* Read the zlib header. In this case, it should be "ZLIB"
followed by the uncompressed section size, 8 bytes in
big-endian order. */
uncompressed_size = start[4]; uncompressed_size <<= 8;
uncompressed_size += start[5]; uncompressed_size <<= 8;
uncompressed_size += start[6]; uncompressed_size <<= 8;
uncompressed_size += start[7]; uncompressed_size <<= 8;
uncompressed_size += start[8]; uncompressed_size <<= 8;
uncompressed_size += start[9]; uncompressed_size <<= 8;
uncompressed_size += start[10]; uncompressed_size <<= 8;
uncompressed_size += start[11];
start += 12;
new_size -= 12;
}
if (uncompressed_size
&& uncompress_section_contents ((unsigned char **) & start,
uncompressed_size, & new_size))
num_bytes = new_size;
}
/* If the section being dumped has relocations against it the user might
be expecting these relocations to have been applied. Check for this
case and issue a warning message in order to avoid confusion.
FIXME: Maybe we ought to have an option that dumps a section with
relocs applied ? */
for (relsec = section_headers;
relsec < section_headers + elf_header.e_shnum;
++relsec)
{
if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL)
|| relsec->sh_info >= elf_header.e_shnum
|| section_headers + relsec->sh_info != section
|| relsec->sh_size == 0
|| relsec->sh_link >= elf_header.e_shnum)
continue;
printf (_(" Note: This section has relocations against it, but these have NOT been applied to this dump.\n"));
break;
}
data = start;
end = start + num_bytes;
some_strings_shown = FALSE;
while (data < end)
{
while (!ISPRINT (* data))
if (++ data >= end)
break;
if (data < end)
{
size_t maxlen = end - data;
#ifndef __MSVCRT__
/* PR 11128: Use two separate invocations in order to work
around bugs in the Solaris 8 implementation of printf. */
printf (" [%6tx] ", data - start);
#else
printf (" [%6Ix] ", (size_t) (data - start));
#endif
if (maxlen > 0)
{
print_symbol ((int) maxlen, data);
putchar ('\n');
data += strnlen (data, maxlen);
}
else
{
printf (_("<corrupt>\n"));
data = end;
}
some_strings_shown = TRUE;
}
}
if (! some_strings_shown)
printf (_(" No strings found in this section."));
free (real_start);
putchar ('\n');
}
static void
dump_section_as_bytes (Elf_Internal_Shdr * section,
FILE * file,
bfd_boolean relocate)
{
Elf_Internal_Shdr * relsec;
bfd_size_type bytes;
bfd_size_type section_size;
bfd_vma addr;
unsigned char * data;
unsigned char * real_start;
unsigned char * start;
real_start = start = (unsigned char *) get_section_contents (section, file);
if (start == NULL)
return;
section_size = section->sh_size;
printf (_("\nHex dump of section '%s':\n"), printable_section_name (section));
if (decompress_dumps)
{
dwarf_size_type new_size = section_size;
dwarf_size_type uncompressed_size = 0;
if ((section->sh_flags & SHF_COMPRESSED) != 0)
{
Elf_Internal_Chdr chdr;
unsigned int compression_header_size
= get_compression_header (& chdr, start);
if (chdr.ch_type == ELFCOMPRESS_ZLIB
&& chdr.ch_addralign == section->sh_addralign)
{
uncompressed_size = chdr.ch_size;
start += compression_header_size;
new_size -= compression_header_size;
}
}
else if (new_size > 12 && streq ((char *) start, "ZLIB"))
{
/* Read the zlib header. In this case, it should be "ZLIB"
followed by the uncompressed section size, 8 bytes in
big-endian order. */
uncompressed_size = start[4]; uncompressed_size <<= 8;
uncompressed_size += start[5]; uncompressed_size <<= 8;
uncompressed_size += start[6]; uncompressed_size <<= 8;
uncompressed_size += start[7]; uncompressed_size <<= 8;
uncompressed_size += start[8]; uncompressed_size <<= 8;
uncompressed_size += start[9]; uncompressed_size <<= 8;
uncompressed_size += start[10]; uncompressed_size <<= 8;
uncompressed_size += start[11];
start += 12;
new_size -= 12;
}
if (uncompressed_size
&& uncompress_section_contents (& start, uncompressed_size,
& new_size))
section_size = new_size;
}
if (relocate)
{
apply_relocations (file, section, start, section_size, NULL, NULL);
}
else
{
/* If the section being dumped has relocations against it the user might
be expecting these relocations to have been applied. Check for this
case and issue a warning message in order to avoid confusion.
FIXME: Maybe we ought to have an option that dumps a section with
relocs applied ? */
for (relsec = section_headers;
relsec < section_headers + elf_header.e_shnum;
++relsec)
{
if ((relsec->sh_type != SHT_RELA && relsec->sh_type != SHT_REL)
|| relsec->sh_info >= elf_header.e_shnum
|| section_headers + relsec->sh_info != section
|| relsec->sh_size == 0
|| relsec->sh_link >= elf_header.e_shnum)
continue;
printf (_(" NOTE: This section has relocations against it, but these have NOT been applied to this dump.\n"));
break;
}
}
addr = section->sh_addr;
bytes = section_size;
data = start;
while (bytes)
{
int j;
int k;
int lbytes;
lbytes = (bytes > 16 ? 16 : bytes);
printf (" 0x%8.8lx ", (unsigned long) addr);
for (j = 0; j < 16; j++)
{
if (j < lbytes)
printf ("%2.2x", data[j]);
else
printf (" ");
if ((j & 3) == 3)
printf (" ");
}
for (j = 0; j < lbytes; j++)
{
k = data[j];
if (k >= ' ' && k < 0x7f)
printf ("%c", k);
else
printf (".");
}
putchar ('\n');
data += lbytes;
addr += lbytes;
bytes -= lbytes;
}
free (real_start);
putchar ('\n');
}
static int

7
binutils/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2015-05-15 Nick Clifton <nickc@redhat.com>
* binutils-all/z.s: New test. Checks the --decompress option to
readelf.
* binutils-all/readelf.exp: Run the test.
* binutils-all/readelf.z: Expected output from readelf.
2015-05-14 H.J. Lu <hongjiu.lu@intel.com>
* binutils-all/compress.exp: Replace "$OBJDUMP -s -j .debug_info"

28
binutils/testsuite/binutils-all/readelf.exp
View File

@ -346,8 +346,8 @@ readelf_dump_test
if {![binutils_assemble $srcdir/$subdir/version.s tmpdir/version.o]} then {
perror "could not assemble version note test file"
unresolved "readelf - failed to assemble"
return
}
fail "readelf -n"
} else {
if ![is_remote host] {
set tempfile tmpdir/version.o
@ -356,14 +356,16 @@ if ![is_remote host] {
}
readelf_test -n $tempfile readelf.n {}
}
# PR 18374 - Check that relocations against the .debug_loc section
# do not prevent readelf from displaying all the location lists.
if {![binutils_assemble $srcdir/$subdir/pr18374.s tmpdir/pr18374.o]} then {
perror "could not assemble PR18374 test file"
unresolved "readelf - failed to assemble"
return
}
fail "readelf --debug-loc"
} else {
if ![is_remote host] {
set tempfile tmpdir/pr18374.o
@ -372,3 +374,21 @@ if ![is_remote host] {
}
readelf_test --debug-dump=loc $tempfile readelf.pr18374 {}
}
# Check that decompressed dumps work.
if {![binutils_assemble $srcdir/$subdir/z.s tmpdir/z.o]} then {
perror "could not assemble decompress dump test file"
unresolved "readelf - failed to assemble"
fail "readelf -z"
} else {
if ![is_remote host] {
set tempfile tmpdir/z.o
} else {
set tempfile [remote_download host tmpdir/z.o]
}
readelf_test {--decompress --hex-dump .debug_loc} $tempfile readelf.z {}
}

8
binutils/testsuite/binutils-all/readelf.z Normal file
View File

@ -0,0 +1,8 @@
Hex dump of section '.debug_loc':
0x00000000 00000000 00000000 01005000 00000000 ..........P.....
0x00000010 00000004 00f30150 9f000000 00000000 .......P........
0x00000020 00000000 00000000 00010051 00000000 ...........Q....
0x00000030 00000000 0300717f 9f000000 00000000 ......q.........
0x00000040 000b0070 0020f301 51227000 229f0000 ...p. ..Q"p."...
0x00000050 00000000 00000b00 70002070 0022f301 ........p. p."..
0x00000060 51229f00 00000000 000000 Q".........

70
binutils/testsuite/binutils-all/z.s Normal file
View File

@ -0,0 +1,70 @@
.section .debug_loc,"",%progbits
.byte 0x5a
.byte 0x4c
.byte 0x49
.byte 0x42
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x00
.byte 0x6b
.byte 0x78
.byte 0x9c
.byte 0x63
.byte 0x60
.byte 0x80
.byte 0x00
.byte 0x46
.byte 0x86
.byte 0x00
.byte 0x28
.byte 0x8b
.byte 0x81
.byte 0x85
.byte 0xe1
.byte 0x33
.byte 0x63
.byte 0xc0
.byte 0x7c
.byte 0x06
.byte 0x34
.byte 0xc0
.byte 0xc8
.byte 0x10
.byte 0x08
.byte 0x63
.byte 0x32
.byte 0x33
.byte 0x14
.byte 0xd6
.byte 0xc3
.byte 0xe5
.byte 0xb9
.byte 0x19
.byte 0x0a
.byte 0x18
.byte 0x14
.byte 0x3e
.byte 0x33
.byte 0x06
.byte 0x2a
.byte 0x15
.byte 0x30
.byte 0x28
.byte 0xa1
.byte 0x0a
.byte 0x02
.byte 0x05
.byte 0x40
.byte 0xe2
.byte 0x70
.byte 0x41
.byte 0x00
.byte 0xc1
.byte 0x6a
.byte 0x0a
.byte 0x83