From 9c41109d368bad91f2c3e8ebcdce18e521b0da0c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 27 Sep 2013 18:05:03 +0000 Subject: [PATCH] Pass offset_size to print_dwarf_vma for cie_id binutils/ * dwarf.c (display_debug_frames): Pass offset_size to print_dwarf_vma for cie_id. binutils/testsuite/ * binutils-all/x86-64/compressed-1a.d: Updated for 64-bit addresses. --- binutils/ChangeLog | 5 +++++ binutils/dwarf.c | 4 ++-- binutils/testsuite/ChangeLog | 4 ++++ binutils/testsuite/binutils-all/x86-64/compressed-1a.d | 6 +++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 5f64635da23..95ada6f7b2f 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,8 @@ +2013-09-27 H.J. Lu + + * dwarf.c (display_debug_frames): Pass offset_size to + print_dwarf_vma for cie_id. + 2013-09-20 Alan Modra * configure: Regenerate. diff --git a/binutils/dwarf.c b/binutils/dwarf.c index 8a233aa10ff..bd736477c38 100644 --- a/binutils/dwarf.c +++ b/binutils/dwarf.c @@ -5249,7 +5249,7 @@ display_debug_frames (struct dwarf_section *section, printf ("\n%08lx ", (unsigned long) (saved_start - section_start)); print_dwarf_vma (length, fc->ptr_size); - print_dwarf_vma (cie_id, fc->ptr_size); + print_dwarf_vma (cie_id, offset_size); if (do_debug_frames_interp) { @@ -5385,7 +5385,7 @@ display_debug_frames (struct dwarf_section *section, printf ("\n%08lx %s %s FDE cie=%08lx pc=", (unsigned long)(saved_start - section_start), dwarf_vmatoa_1 (NULL, length, fc->ptr_size), - dwarf_vmatoa_1 (NULL, cie_id, fc->ptr_size), + dwarf_vmatoa_1 (NULL, cie_id, offset_size), (unsigned long)(cie->chunk_start - section_start)); if (fc->segment_size) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index ac2de1f2708..6c98a1376b3 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2013-09-27 H.J. Lu + + * binutils-all/x86-64/compressed-1a.d: Updated for 64-bit addresses. + 2013-09-12 Nick Clifton * binutils-all/x86-64/compressed-1a.d: Update expected output to diff --git a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d index 0dfbdc1b047..f1e4bbcd88f 100644 --- a/binutils/testsuite/binutils-all/x86-64/compressed-1a.d +++ b/binutils/testsuite/binutils-all/x86-64/compressed-1a.d @@ -135,7 +135,7 @@ Contents of the .[z]?debug_str section: Contents of the .[z]?debug_frame section: -00000000 00000014 ffffffff CIE +00000000 0+014 ffffffff CIE Version: 1 Augmentation: "" Code alignment factor: 1 @@ -151,7 +151,7 @@ Contents of the .[z]?debug_frame section: DW_CFA_nop DW_CFA_nop -00000018 00000014 00000000 FDE cie=00000000 pc=0+0000..0+0002 +00000018 0+014 00000000 FDE cie=00000000 pc=0+0000..0+0002 -00000030 00000014 00000000 FDE cie=00000000 pc=0+0010..0+0015 +00000030 0+014 00000000 FDE cie=00000000 pc=0+0010..0+0015 -- 2.30.2