exe_simple64 now passes again

diff --git a/elftools/dwarf/descriptions.py b/elftools/dwarf/descriptions.py
index f46ef810ed045a9eec8d68930413cf75356ea42d..ca00cd1ee7cb1989cd3c3e57f3b2a74c5427e5e0 100644 (file)
--- a/elftools/dwarf/descriptions.py
+++ b/elftools/dwarf/descriptions.py
@@ -82,7 +82,7 @@ def describe_CFI_instructions(entry):
                         'DW_CFA_advance_loc4', 'DW_CFA_advance_loc'):
             _assert_FDE_instruction(instr)
             factored_offset = instr.args[0] * cie['code_alignment_factor']
-            s += '  %s: %s to %08x\n' % (
+            s += '  %s: %s to %016x\n' % (
                 name, factored_offset, factored_offset + pc)
             pc += factored_offset
         elif name in (  'DW_CFA_remember_state', 'DW_CFA_restore_state',

diff --git a/scripts/readelf.py b/scripts/readelf.py
index 9839f710a748cfc6fefdc6a74829fe2d985604f4..c3215b3c22219eb88d06e2b018d2315b46209ea1 100755 (executable)
--- a/scripts/readelf.py
+++ b/scripts/readelf.py
@@ -923,7 +923,7 @@ class ReadElf(object):
 
         for entry in self._dwarfinfo.CFI_entries():
             if isinstance(entry, CIE):
-                self._emitline('\n%08x %08x %08x CIE' % (
+                self._emitline('\n%08x %016x %016x CIE' % (
                     entry.offset, entry['length'], entry['CIE_id']))
                 self._emitline('  Version:               %d' % entry['version'])
                 self._emitline('  Augmentation:          "%s"' % bytes2str(entry['augmentation']))
@@ -932,7 +932,7 @@ class ReadElf(object):
                 self._emitline('  Return address column: %d' % entry['return_address_register'])
                 self._emitline()
             else: # FDE
-                self._emitline('\n%08x %08x %08x FDE cie=%08x pc=%08x..%08x' % (
+                self._emitline('\n%08x %016x %016x FDE cie=%08x pc=%016x..%016x' % (
                     entry.offset,
                     entry['length'],
                     entry['CIE_pointer'],
@@ -953,7 +953,7 @@ class ReadElf(object):
 
         for entry in self._dwarfinfo.CFI_entries():
             if isinstance(entry, CIE):
-                self._emitline('\n%08x %08x %08x CIE "%s" cf=%d df=%d ra=%d' % (
+                self._emitline('\n%08x %016x %016x CIE "%s" cf=%d df=%d ra=%d' % (
                     entry.offset,
                     entry['length'],
                     entry['CIE_id'],
@@ -963,7 +963,7 @@ class ReadElf(object):
                     entry['return_address_register']))
                 ra_regnum = entry['return_address_register']
             else: # FDE
-                self._emitline('\n%08x %08x %08x FDE cie=%08x pc=%08x..%08x' % (
+                self._emitline('\n%08x %016x %016x FDE cie=%08x pc=%016x..%016x' % (
                     entry.offset,
                     entry['length'],
                     entry['CIE_pointer'],

diff --git a/test/external_tools/README.txt b/test/external_tools/README.txt
index 1d7e48a102a87facebec3601a84b766ac87e12f0..3380ccee8cfafa72d7cf91b2196d42fd25003a62 100644 (file)
--- a/test/external_tools/README.txt
+++ b/test/external_tools/README.txt
@@ -1,4 +1,4 @@
 Some utilities that use libelf to create synthetic ELF files
 
 Also, readelf picked up from a built binutils. Run it with --version to version
-details.
+details. The binary is built on a 64-bit Ubuntu machine.

diff --git a/test/run_readelf_tests.py b/test/run_readelf_tests.py
index b65425e6dce2354524384e26dac677acebfbcd9b..afaf6c5fbad861603ad736448a5b552bda4976de 100755 (executable)
--- a/test/run_readelf_tests.py
+++ b/test/run_readelf_tests.py
@@ -30,8 +30,6 @@ READELF_PATH = 'test/external_tools/readelf'
 if not os.path.exists(READELF_PATH):
     READELF_PATH = 'readelf'
 
-print(READELF_PATH)
-
 def discover_testfiles(rootdir):
     """ Discover test files in the given directory. Yield them one by one.
     """