* dwarf.c (dwarf_vmatoa): Rename to dwarf_vmatoa_1 and add a

	precision parameter.
	(dwarf_vmatoa): New wrapper for dwarf_vmatoa_1.
	(print_dwarf_vma): Use dwarf_vmatoa_1.
	(SAFE_BYTE_GET): Add check that VAL is big enough to contain
	AMOUNT bytes.
	(process_debug_info): Use an unsigned int for the offset size.
	(process_debug_pubnames): Likewise.
	(display_debug_aranges): Likewise.
	(struct Frame_Chunk): Use dwarf_vma type for pc_begin and pc_range
	fields.
	(frame_display_row): Use print_dwarf_vma to display dwarf_vma
	values.
	(display_debug_frames): Likewise.

	* binutils-all/x86-64/compressed-1a.d: Update expected output to
	allow for 64-bit addresses.

	* ld-elf/eh1.d: Update expected output to allow for
	64-bit addresses.
	* ld-elf/eh2.d: Likewise.
	* ld-elf/eh3.d: Likewise.
	* ld-elf/eh4.d: Likewise.
	* ld-elf/eh5.d: Likewise.
	* ld-elf/eh6.d: Likewise.
	* ld-mips-elf/eh-frame1-n64.d: Likewise.
	* ld-mips-elf/eh-frame2-n64.d: Likewise.
	* ld-mips-elf/eh-frame3.d: Likewise.

	* gas/cfi/cfi-alpha-1.d: Update expected output to allow for
	64-bit addresses.
	* gas/cfi/cfi-alpha-3.d: Likewise.
	* gas/cfi/cfi-arm-1.d: Likewise.
	* gas/cfi/cfi-common-1.d: Likewise.
	* gas/cfi/cfi-common-2.d: Likewise.
	* gas/cfi/cfi-common-3.d: Likewise.
	* gas/cfi/cfi-common-4.d: Likewise.
	* gas/cfi/cfi-common-5.d: Likewise.
	* gas/cfi/cfi-common-6.d: Likewise.
	* gas/cfi/cfi-common-7.d: Likewise.
	* gas/cfi/cfi-hppa-1.d: Likewise.
	* gas/cfi/cfi-i386-2.d: Likewise.
	* gas/cfi/cfi-i386.d: Likewise.
	* gas/cfi/cfi-m68k.d: Likewise.
	* gas/cfi/cfi-mips-1.d: Likewise.
	* gas/cfi/cfi-ppc-1.d: Likewise.
	* gas/cfi/cfi-s390-1.d: Likewise.
	* gas/cfi/cfi-s390x-1.d: Likewise.
	* gas/cfi/cfi-sh-1.d: Likewise.
	* gas/cfi/cfi-sparc-1.d: Likewise.
	* gas/cfi/cfi-sparc64-1.d: Likewise.
	* gas/cfi/cfi-x86_64.d: Likewise.

23 files changed, 292 insertions, 266 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 2110cd94de..d960d7af44 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,29 @@
+2013-09-12  Nick Clifton  <nickc@redhat.com>
+
+	* gas/cfi/cfi-alpha-1.d: Update expected output to allow for
+	64-bit addresses.
+	* gas/cfi/cfi-alpha-3.d: Likewise.
+	* gas/cfi/cfi-arm-1.d: Likewise.
+	* gas/cfi/cfi-common-1.d: Likewise.
+	* gas/cfi/cfi-common-2.d: Likewise.
+	* gas/cfi/cfi-common-3.d: Likewise.
+	* gas/cfi/cfi-common-4.d: Likewise.
+	* gas/cfi/cfi-common-5.d: Likewise.
+	* gas/cfi/cfi-common-6.d: Likewise.
+	* gas/cfi/cfi-common-7.d: Likewise.
+	* gas/cfi/cfi-hppa-1.d: Likewise.
+	* gas/cfi/cfi-i386-2.d: Likewise.
+	* gas/cfi/cfi-i386.d: Likewise.
+	* gas/cfi/cfi-m68k.d: Likewise.
+	* gas/cfi/cfi-mips-1.d: Likewise.
+	* gas/cfi/cfi-ppc-1.d: Likewise.
+	* gas/cfi/cfi-s390-1.d: Likewise.
+	* gas/cfi/cfi-s390x-1.d: Likewise.
+	* gas/cfi/cfi-sh-1.d: Likewise.
+	* gas/cfi/cfi-sparc-1.d: Likewise.
+	* gas/cfi/cfi-sparc64-1.d: Likewise.
+	* gas/cfi/cfi-x86_64.d: Likewise.
+
 2013-09-04  Tristan Gingold  <gingold@adacore.com>
 
 	* gas/ppc/aix.exp: Run xcoff-toc-1 test.
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-1.d b/gas/testsuite/gas/cfi/cfi-alpha-1.d
index c132f89638..36f03bee8f 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-1.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-1.d
@@ -2,7 +2,7 @@
 #name: CFI on alpha
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+00 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -13,8 +13,8 @@ Contents of the .eh_frame section:
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
 
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000034
-  DW_CFA_advance_loc: 24 to 00000018
+00000014 0+0020 0+0018 FDE cie=00000000 pc=0+0000..0+0034
+  DW_CFA_advance_loc: 24 to 0+0018
   DW_CFA_def_cfa: r15 ofs 32
   DW_CFA_offset: r26 at cfa-32
   DW_CFA_offset: r9 at cfa-24
diff --git a/gas/testsuite/gas/cfi/cfi-alpha-3.d b/gas/testsuite/gas/cfi/cfi-alpha-3.d
index 3c84ce721d..79bf9bdf12 100644
--- a/gas/testsuite/gas/cfi/cfi-alpha-3.d
+++ b/gas/testsuite/gas/cfi/cfi-alpha-3.d
@@ -2,7 +2,7 @@
 #name: CFI on alpha, 3
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -13,20 +13,20 @@ Contents of the .eh_frame section:
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
 
-00000014 00000028 00000018 FDE cie=00000000 pc=00000000..00000040
-  DW_CFA_advance_loc: 4 to 00000004
+00000014 0+0028 0+0018 FDE cie=00000000 pc=0+0000..0+0040
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_offset: 32
-  DW_CFA_advance_loc: 4 to 00000008
+  DW_CFA_advance_loc: 4 to 0+0008
   DW_CFA_offset: r26 at cfa-32
-  DW_CFA_advance_loc: 4 to 0000000c
+  DW_CFA_advance_loc: 4 to 0+000c
   DW_CFA_offset: r9 at cfa-24
-  DW_CFA_advance_loc: 4 to 00000010
+  DW_CFA_advance_loc: 4 to 0+0010
   DW_CFA_offset: r15 at cfa-16
-  DW_CFA_advance_loc: 4 to 00000014
+  DW_CFA_advance_loc: 4 to 0+0014
   DW_CFA_offset: r34 at cfa-8
-  DW_CFA_advance_loc: 4 to 00000018
+  DW_CFA_advance_loc: 4 to 0+0018
   DW_CFA_def_cfa_register: r15
-  DW_CFA_advance_loc: 36 to 0000003c
+  DW_CFA_advance_loc: 36 to 0+003c
   DW_CFA_def_cfa: r30 ofs 0
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-arm-1.d b/gas/testsuite/gas/cfi/cfi-arm-1.d
index e3b534c310..8987a7c8b6 100644
--- a/gas/testsuite/gas/cfi/cfi-arm-1.d
+++ b/gas/testsuite/gas/cfi/cfi-arm-1.d
@@ -3,7 +3,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 2
@@ -13,7 +13,7 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r13 ofs 0
 
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000018
+00000014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+0018
   DW_CFA_advance_loc: 4 to 00000004
   DW_CFA_def_cfa: r12 ofs 0
   DW_CFA_advance_loc: 4 to 00000008
diff --git a/gas/testsuite/gas/cfi/cfi-common-1.d b/gas/testsuite/gas/cfi/cfi-common-1.d
index 81f3473550..40000b8766 100644
--- a/gas/testsuite/gas/cfi/cfi-common-1.d
+++ b/gas/testsuite/gas/cfi/cfi-common-1.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -15,7 +15,7 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000014 000000(18|1c|20) 00000018 FDE cie=00000000 pc=.*
+00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_offset(_extended_sf|): r1( \((rdx|ecx)\)|) at cfa-8
diff --git a/gas/testsuite/gas/cfi/cfi-common-2.d b/gas/testsuite/gas/cfi/cfi-common-2.d
index 184f17d0c7..1e7092ccb2 100644
--- a/gas/testsuite/gas/cfi/cfi-common-2.d
+++ b/gas/testsuite/gas/cfi/cfi-common-2.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -11,7 +11,7 @@ Contents of the .eh_frame section:
   Return address column: .*
   Augmentation data:     [01]b
 #...
-00000014 000000[12][c0] 00000018 FDE cie=00000000 pc=.*
+00000014 0+00[12][c0] 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc: 4 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-common-3.d b/gas/testsuite/gas/cfi/cfi-common-3.d
index b1611e2683..954556d07d 100644
--- a/gas/testsuite/gas/cfi/cfi-common-3.d
+++ b/gas/testsuite/gas/cfi/cfi-common-3.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -11,7 +11,7 @@ Contents of the .eh_frame section:
   Return address column: .*
   Augmentation data:     [01]b
 #...
-00000014 00000010 00000018 FDE cie=00000000 pc=.*
+00000014 0+0010 0+0018 FDE cie=00000000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_remember_state
   DW_CFA_restore_state
diff --git a/gas/testsuite/gas/cfi/cfi-common-4.d b/gas/testsuite/gas/cfi/cfi-common-4.d
index deef6f8ce8..24b218b107 100644
--- a/gas/testsuite/gas/cfi/cfi-common-4.d
+++ b/gas/testsuite/gas/cfi/cfi-common-4.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -11,11 +11,11 @@ Contents of the .eh_frame section:
   Return address column: .*
   Augmentation data:     [01]b
 #...
-00000014 00000010 00000018 FDE cie=00000000 pc=.*
+00000014 0+0010 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_remember_state
   DW_CFA_restore_state
 #...
-00000028 0000001[04] 0000002c FDE cie=00000000 pc=.*
+00000028 0+001[04] 0+002c FDE cie=0+0000 pc=.*
   DW_CFA_remember_state
   DW_CFA_restore_state
 #pass
diff --git a/gas/testsuite/gas/cfi/cfi-common-5.d b/gas/testsuite/gas/cfi/cfi-common-5.d
index 81fc212903..fa2292fea5 100644
--- a/gas/testsuite/gas/cfi/cfi-common-5.d
+++ b/gas/testsuite/gas/cfi/cfi-common-5.d
@@ -2,7 +2,7 @@
 #name: CFI common 5
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -10,13 +10,13 @@ Contents of the .eh_frame section:
   Return address column: .*
   Augmentation data:     [01]b
 #...
-00000014 00000014 00000018 FDE cie=00000000 pc=.*
+00000014 0+0014 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_remember_state
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_restore_state
 #...
-0000002c 0000001[48] 00000030 FDE cie=00000000 pc=.*
+0000002c 0+001[48] 0+0030 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 4 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc: 4 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-common-6.d b/gas/testsuite/gas/cfi/cfi-common-6.d
index c4ed010cb3..16fc20a5fd 100644
--- a/gas/testsuite/gas/cfi/cfi-common-6.d
+++ b/gas/testsuite/gas/cfi/cfi-common-6.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000018 00000000 CIE
+00000000 0+0018 0+0000 CIE
   Version:               1
   Augmentation:          "zPLR"
   Code alignment factor: .*
@@ -15,14 +15,14 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-0000001c 00000018 00000020 FDE cie=00000000 pc=000000(00|24)..000000(04|28)
+0000001c 0+0018 0+0020 FDE cie=0+0000 pc=0+00(00|24)..0+00(04|28)
   Augmentation data:     (00 00 00 00 de ad be ef|ef be ad de 00 00 00 00)
 
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000038 00000010 00000000 CIE
+00000038 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zLR"
   Code alignment factor: .*
@@ -32,21 +32,21 @@ Contents of the .eh_frame section:
 
   DW_CFA_nop
 
-0000004c 00000018 00000018 FDE cie=00000038 pc=000000(04|58)..000000(08|5c)
+0000004c 0+0018 0+0018 FDE cie=0+0038 pc=0+00(04|58)..0+00(08|5c)
   Augmentation data:     (00 00 00 00 de ad be ef|ef be ad de 00 00 00 00)
 
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000068 00000018 0000006c FDE cie=00000000 pc=000000(08|78)..000000(0c|7c)
+00000068 0+0018 0+006c FDE cie=0+0000 pc=0+00(08|78)..0+00(0c|7c)
   Augmentation data:     (00 00 00 00 be ef de ad|ad de ef be 00 00 00 00)
 
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000084 00000018 00000000 CIE
+00000084 0+0018 0+0000 CIE
   Version:               1
   Augmentation:          "zPLR"
   Code alignment factor: .*
@@ -58,14 +58,14 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-000000a0 00000014 00000020 FDE cie=00000084 pc=000000(0c|b4)..000000(10|b8)
+000000a0 0+0014 0+0020 FDE cie=0+0084 pc=0+00(0c|b4)..0+00(10|b8)
   Augmentation data:     .. .. .. ..
 
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-000000b8 00000014 00000038 FDE cie=00000084 pc=000000(10|d0)..000000(14|d4)
+000000b8 0+0014 0+0038 FDE cie=0+0084 pc=0+00(10|d0)..0+00(14|d4)
   Augmentation data:     .. .. .. ..
 
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-common-7.d b/gas/testsuite/gas/cfi/cfi-common-7.d
index 17a999db08..3241a9fcca 100644
--- a/gas/testsuite/gas/cfi/cfi-common-7.d
+++ b/gas/testsuite/gas/cfi/cfi-common-7.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: .*
@@ -15,7 +15,7 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000014 000000(18|1c|20) 00000018 FDE cie=00000000 pc=.*
+00000014 0+00(18|1c|20) 0+0018 FDE cie=0+0000 pc=.*
   DW_CFA_advance_loc: 16 to .*
   DW_CFA_def_cfa: r0( \([er]ax\)|) ofs 16
   DW_CFA_advance_loc[24]: 75040 to .*
diff --git a/gas/testsuite/gas/cfi/cfi-hppa-1.d b/gas/testsuite/gas/cfi/cfi-hppa-1.d
index cbb0767bcd..e434c4f238 100644
--- a/gas/testsuite/gas/cfi/cfi-hppa-1.d
+++ b/gas/testsuite/gas/cfi/cfi-hppa-1.d
@@ -2,7 +2,7 @@
 #name: CFI on hppa
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+00000000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -12,25 +12,25 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r30 ofs 0
 
-00000014 000000(18|20) 00000018 FDE cie=00000000 pc=00000000..00000018
-  DW_CFA_advance_loc: 8 to 00000008
+00000014 0+00(18|20) 0+0018 FDE cie=0+0000 pc=0+0000..0+0018
+  DW_CFA_advance_loc: 8 to 0+0008
   DW_CFA_def_cfa_register: r3
-  DW_CFA_advance_loc: 4 to 0000000c
+  DW_CFA_advance_loc: 4 to 0+000c
   DW_CFA_def_cfa_offset: 4660
-  DW_CFA_advance_loc: 8 to 00000014
+  DW_CFA_advance_loc: 8 to 0+0014
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
 
-0000003[08] 000000(18|20) 0000003[4c] FDE cie=00000000 pc=00000018..00000040
-  DW_CFA_advance_loc: 12 to 00000024
+0000003[08] 0+00(18|20) 0+003[4c] FDE cie=0+0000 pc=0+0018..0+0040
+  DW_CFA_advance_loc: 12 to 0+0024
   DW_CFA_def_cfa_register: r3
   DW_CFA_offset_extended_sf: r2 at cfa-24
-  DW_CFA_advance_loc: 24 to 0000003c
+  DW_CFA_advance_loc: 24 to 0+003c
   DW_CFA_def_cfa_register: r30
   DW_CFA_nop
   DW_CFA_nop
 
-000000[45]c 0000001[08] 000000[56]0 FDE cie=00000000 pc=00000040..00000048
+000000[45]c 0+001[08] 0+00[56]0 FDE cie=0+0000 pc=0+0040..0+0048
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-i386-2.d b/gas/testsuite/gas/cfi/cfi-i386-2.d
index 339b47b386..2161b01ccd 100644
--- a/gas/testsuite/gas/cfi/cfi-i386-2.d
+++ b/gas/testsuite/gas/cfi/cfi-i386-2.d
@@ -2,7 +2,7 @@
 #name: CFI on i386, 2
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+00000000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -15,11 +15,11 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000018 0000001c FDE cie=00000000 pc=00000020..00000029
-  DW_CFA_advance_loc: 1 to 00000021
+00000018 0+0018 0+001c FDE cie=0+0000 pc=0+0020..0+0029
+  DW_CFA_advance_loc: 1 to 0+0021
   DW_CFA_def_cfa_offset: 8
   DW_CFA_offset: r5 at cfa-8
-  DW_CFA_advance_loc: 4 to 00000025
+  DW_CFA_advance_loc: 4 to 0+0025
   DW_CFA_offset: r3 at cfa-12
   DW_CFA_def_cfa_offset: 12
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-i386.d b/gas/testsuite/gas/cfi/cfi-i386.d
index 9b24003a62..bf08509933 100644
--- a/gas/testsuite/gas/cfi/cfi-i386.d
+++ b/gas/testsuite/gas/cfi/cfi-i386.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+00000000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -16,13 +16,13 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000012
-  DW_CFA_advance_loc: 6 to 00000006
+00000018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0012
+  DW_CFA_advance_loc: 6 to 0+0006
   DW_CFA_def_cfa_offset: 4664
-  DW_CFA_advance_loc: 11 to 00000011
+  DW_CFA_advance_loc: 11 to 0+0011
   DW_CFA_def_cfa_offset: 4
 
-00000030 00000018 00000034 FDE cie=00000000 pc=00000012..0000001f
+00000030 0+0018 0+0034 FDE cie=0+0000 pc=0+0012..0+001f
   DW_CFA_advance_loc: 1 to 00000013
   DW_CFA_def_cfa_offset: 8
   DW_CFA_offset: r5 \(ebp\) at cfa-8
@@ -31,23 +31,23 @@ Contents of the .eh_frame section:
   DW_CFA_advance_loc: 9 to 0000001e
   DW_CFA_def_cfa_register: r4 \(esp\)
 
-0000004c 00000014 00000050 FDE cie=00000000 pc=0000001f..0000002f
-  DW_CFA_advance_loc: 2 to 00000021
+0000004c 0+0014 0+0050 FDE cie=0+0000 pc=0+001f..0+002f
+  DW_CFA_advance_loc: 2 to 0+0021
   DW_CFA_def_cfa_register: r3 \(ebx\)
-  DW_CFA_advance_loc: 13 to 0000002e
+  DW_CFA_advance_loc: 13 to 0+002e
   DW_CFA_def_cfa: r4 \(esp\) ofs 4
 
-00000064 00000010 00000068 FDE cie=00000000 pc=0000002f..00000035
+00000064 0+0010 0+0068 FDE cie=0+000 pc=0+002f..0+0035
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000078 00000010 0000007c FDE cie=00000000 pc=00000035..00000044
+00000078 0+0010 0+007c FDE cie=0+0000 pc=0+0035..0+0044
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-0000008c 00000010 00000000 CIE
+0000008c 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -58,110 +58,110 @@ Contents of the .eh_frame section:
   DW_CFA_undefined: r8 \(eip\)
   DW_CFA_nop
 
-000000a0 000000ac 00000018 FDE cie=0000008c pc=00000044..00000079
-  DW_CFA_advance_loc: 1 to 00000045
+0+00a0 0+00ac 0+0018 FDE cie=0+008c pc=0+0044..0+0079
+  DW_CFA_advance_loc: 1 to 0+0045
   DW_CFA_undefined: r0 \(eax\)
-  DW_CFA_advance_loc: 1 to 00000046
+  DW_CFA_advance_loc: 1 to 0+0046
   DW_CFA_undefined: r1 \(ecx\)
-  DW_CFA_advance_loc: 1 to 00000047
+  DW_CFA_advance_loc: 1 to 0+0047
   DW_CFA_undefined: r2 \(edx\)
-  DW_CFA_advance_loc: 1 to 00000048
+  DW_CFA_advance_loc: 1 to 0+0048
   DW_CFA_undefined: r3 \(ebx\)
-  DW_CFA_advance_loc: 1 to 00000049
+  DW_CFA_advance_loc: 1 to 0+0049
   DW_CFA_undefined: r4 \(esp\)
-  DW_CFA_advance_loc: 1 to 0000004a
+  DW_CFA_advance_loc: 1 to 0+004a
   DW_CFA_undefined: r5 \(ebp\)
-  DW_CFA_advance_loc: 1 to 0000004b
+  DW_CFA_advance_loc: 1 to 0+004b
   DW_CFA_undefined: r6 \(esi\)
-  DW_CFA_advance_loc: 1 to 0000004c
+  DW_CFA_advance_loc: 1 to 0+004c
   DW_CFA_undefined: r7 \(edi\)
-  DW_CFA_advance_loc: 1 to 0000004d
+  DW_CFA_advance_loc: 1 to 0+004d
   DW_CFA_undefined: r9 \(eflags\)
-  DW_CFA_advance_loc: 1 to 0000004e
+  DW_CFA_advance_loc: 1 to 0+004e
   DW_CFA_undefined: r40 \(es\)
-  DW_CFA_advance_loc: 1 to 0000004f
+  DW_CFA_advance_loc: 1 to 0+004f
   DW_CFA_undefined: r41 \(cs\)
-  DW_CFA_advance_loc: 1 to 00000050
+  DW_CFA_advance_loc: 1 to 0+0050
   DW_CFA_undefined: r43 \(ds\)
-  DW_CFA_advance_loc: 1 to 00000051
+  DW_CFA_advance_loc: 1 to 0+0051
   DW_CFA_undefined: r42 \(ss\)
-  DW_CFA_advance_loc: 1 to 00000052
+  DW_CFA_advance_loc: 1 to 0+0052
   DW_CFA_undefined: r44 \(fs\)
-  DW_CFA_advance_loc: 1 to 00000053
+  DW_CFA_advance_loc: 1 to 0+0053
   DW_CFA_undefined: r45 \(gs\)
-  DW_CFA_advance_loc: 1 to 00000054
+  DW_CFA_advance_loc: 1 to 0+0054
   DW_CFA_undefined: r48 \(tr\)
-  DW_CFA_advance_loc: 1 to 00000055
+  DW_CFA_advance_loc: 1 to 0+0055
   DW_CFA_undefined: r49 \(ldtr\)
-  DW_CFA_advance_loc: 1 to 00000056
+  DW_CFA_advance_loc: 1 to 0+0056
   DW_CFA_undefined: r39 \(mxcsr\)
-  DW_CFA_advance_loc: 1 to 00000057
+  DW_CFA_advance_loc: 1 to 0+0057
   DW_CFA_undefined: r21 \(xmm0\)
-  DW_CFA_advance_loc: 1 to 00000058
+  DW_CFA_advance_loc: 1 to 0+0058
   DW_CFA_undefined: r22 \(xmm1\)
-  DW_CFA_advance_loc: 1 to 00000059
+  DW_CFA_advance_loc: 1 to 0+0059
   DW_CFA_undefined: r23 \(xmm2\)
-  DW_CFA_advance_loc: 1 to 0000005a
+  DW_CFA_advance_loc: 1 to 0+005a
   DW_CFA_undefined: r24 \(xmm3\)
-  DW_CFA_advance_loc: 1 to 0000005b
+  DW_CFA_advance_loc: 1 to 0+005b
   DW_CFA_undefined: r25 \(xmm4\)
-  DW_CFA_advance_loc: 1 to 0000005c
+  DW_CFA_advance_loc: 1 to 0+005c
   DW_CFA_undefined: r26 \(xmm5\)
-  DW_CFA_advance_loc: 1 to 0000005d
+  DW_CFA_advance_loc: 1 to 0+005d
   DW_CFA_undefined: r27 \(xmm6\)
-  DW_CFA_advance_loc: 1 to 0000005e
+  DW_CFA_advance_loc: 1 to 0+005e
   DW_CFA_undefined: r28 \(xmm7\)
-  DW_CFA_advance_loc: 1 to 0000005f
+  DW_CFA_advance_loc: 1 to 0+005f
   DW_CFA_undefined: r37 \(fcw\)
-  DW_CFA_advance_loc: 1 to 00000060
+  DW_CFA_advance_loc: 1 to 0+0060
   DW_CFA_undefined: r38 \(fsw\)
-  DW_CFA_advance_loc: 1 to 00000061
+  DW_CFA_advance_loc: 1 to 0+0061
   DW_CFA_undefined: r11 \(st\(?0?\)?\)
-  DW_CFA_advance_loc: 1 to 00000062
+  DW_CFA_advance_loc: 1 to 0+0062
   DW_CFA_undefined: r12 \(st\(?1\)?\)
-  DW_CFA_advance_loc: 1 to 00000063
+  DW_CFA_advance_loc: 1 to 0+0063
   DW_CFA_undefined: r13 \(st\(?2\)?\)
-  DW_CFA_advance_loc: 1 to 00000064
+  DW_CFA_advance_loc: 1 to 0+0064
   DW_CFA_undefined: r14 \(st\(?3\)?\)
-  DW_CFA_advance_loc: 1 to 00000065
+  DW_CFA_advance_loc: 1 to 0+0065
   DW_CFA_undefined: r15 \(st\(?4\)?\)
-  DW_CFA_advance_loc: 1 to 00000066
+  DW_CFA_advance_loc: 1 to 0+0066
   DW_CFA_undefined: r16 \(st\(?5\)?\)
-  DW_CFA_advance_loc: 1 to 00000067
+  DW_CFA_advance_loc: 1 to 0+0067
   DW_CFA_undefined: r17 \(st\(?6\)?\)
-  DW_CFA_advance_loc: 1 to 00000068
+  DW_CFA_advance_loc: 1 to 0+0068
   DW_CFA_undefined: r18 \(st\(?7\)?\)
-  DW_CFA_advance_loc: 1 to 00000069
+  DW_CFA_advance_loc: 1 to 0+0069
   DW_CFA_undefined: r29 \(mm0\)
-  DW_CFA_advance_loc: 1 to 0000006a
+  DW_CFA_advance_loc: 1 to 0+006a
   DW_CFA_undefined: r30 \(mm1\)
-  DW_CFA_advance_loc: 1 to 0000006b
+  DW_CFA_advance_loc: 1 to 0+006b
   DW_CFA_undefined: r31 \(mm2\)
-  DW_CFA_advance_loc: 1 to 0000006c
+  DW_CFA_advance_loc: 1 to 0+006c
   DW_CFA_undefined: r32 \(mm3\)
-  DW_CFA_advance_loc: 1 to 0000006d
+  DW_CFA_advance_loc: 1 to 0+006d
   DW_CFA_undefined: r33 \(mm4\)
-  DW_CFA_advance_loc: 1 to 0000006e
+  DW_CFA_advance_loc: 1 to 0+006e
   DW_CFA_undefined: r34 \(mm5\)
-  DW_CFA_advance_loc: 1 to 0000006f
+  DW_CFA_advance_loc: 1 to 0+006f
   DW_CFA_undefined: r35 \(mm6\)
-  DW_CFA_advance_loc: 1 to 00000070
+  DW_CFA_advance_loc: 1 to 0+0070
   DW_CFA_undefined: r36 \(mm7\)
-  DW_CFA_advance_loc: 1 to 00000071
+  DW_CFA_advance_loc: 1 to 0+0071
   DW_CFA_undefined: r93 \(k0\)
-  DW_CFA_advance_loc: 1 to 00000072
+  DW_CFA_advance_loc: 1 to 0+0072
   DW_CFA_undefined: r94 \(k1\)
-  DW_CFA_advance_loc: 1 to 00000073
+  DW_CFA_advance_loc: 1 to 0+0073
   DW_CFA_undefined: r95 \(k2\)
-  DW_CFA_advance_loc: 1 to 00000074
+  DW_CFA_advance_loc: 1 to 0+0074
   DW_CFA_undefined: r96 \(k3\)
-  DW_CFA_advance_loc: 1 to 00000075
+  DW_CFA_advance_loc: 1 to 0+0075
   DW_CFA_undefined: r97 \(k4\)
-  DW_CFA_advance_loc: 1 to 00000076
+  DW_CFA_advance_loc: 1 to 0+0076
   DW_CFA_undefined: r98 \(k5\)
-  DW_CFA_advance_loc: 1 to 00000077
+  DW_CFA_advance_loc: 1 to 0+0077
   DW_CFA_undefined: r99 \(k6\)
-  DW_CFA_advance_loc: 1 to 00000078
+  DW_CFA_advance_loc: 1 to 0+0078
   DW_CFA_undefined: r100 \(k7\)
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-m68k.d b/gas/testsuite/gas/cfi/cfi-m68k.d
index 4bced7aa58..017c7885c4 100644
--- a/gas/testsuite/gas/cfi/cfi-m68k.d
+++ b/gas/testsuite/gas/cfi/cfi-m68k.d
@@ -2,7 +2,7 @@
 #name: CFI on m68k
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 2
@@ -15,22 +15,22 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..0000000c
-  DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+000c
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_offset: 4664
-  DW_CFA_advance_loc: 6 to 0000000a
+  DW_CFA_advance_loc: 6 to 0+000a
   DW_CFA_def_cfa_offset: 4
 
-00000030 00000018 00000034 FDE cie=00000000 pc=0000000c..00000018
-  DW_CFA_advance_loc: 4 to 00000010
+0+0030 0+0018 0+0034 FDE cie=0+0000 pc=0+000c..0+0018
+  DW_CFA_advance_loc: 4 to 0+0010
   DW_CFA_def_cfa_offset: 8
   DW_CFA_offset: r14 at cfa-8
   DW_CFA_def_cfa_register: r14
-  DW_CFA_advance_loc: 6 to 00000016
+  DW_CFA_advance_loc: 6 to 0+0016
   DW_CFA_def_cfa_register: r15
   DW_CFA_nop
 
-0000004c 00000010 00000050 FDE cie=00000000 pc=00000018..0000001c
+0+004c 0+0010 0+0050 FDE cie=0+0000 pc=0+0018..0+001c
 
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-mips-1.d b/gas/testsuite/gas/cfi/cfi-mips-1.d
index bd377527f3..6635b9f181 100644
--- a/gas/testsuite/gas/cfi/cfi-mips-1.d
+++ b/gas/testsuite/gas/cfi/cfi-mips-1.d
@@ -2,7 +2,7 @@
 #name: CFI on mips, 1
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -15,13 +15,13 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 0000001c 0000001c FDE cie=00000000 pc=00000000..0000002c
-  DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+001c 0+001c FDE cie=0+0000 pc=0+0000..0+002c
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_offset: 8
-  DW_CFA_advance_loc: 4 to 00000008
+  DW_CFA_advance_loc: 4 to 0+0008
   DW_CFA_offset: r30 at cfa-8
-  DW_CFA_advance_loc: 4 to 0000000c
+  DW_CFA_advance_loc: 4 to 0+000c
   DW_CFA_def_cfa: r30 ofs 8
-  DW_CFA_advance_loc: 24 to 00000024
+  DW_CFA_advance_loc: 24 to 0+0024
   DW_CFA_def_cfa: r29 ofs 0
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-ppc-1.d b/gas/testsuite/gas/cfi/cfi-ppc-1.d
index 907fe0bdca..62b4a8e137 100644
--- a/gas/testsuite/gas/cfi/cfi-ppc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-ppc-1.d
@@ -6,7 +6,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: [24]
@@ -16,16 +16,16 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r1 ofs 0
 
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..00000070
-  DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+0070
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_offset: 48
-  DW_CFA_advance_loc: 16 to 00000014
+  DW_CFA_advance_loc: 16 to 0+0014
   DW_CFA_offset: r27 at cfa-20
   DW_CFA_offset: r26 at cfa-24
   DW_CFA_offset_extended_sf: r65 at cfa\+4
-  DW_CFA_advance_loc: 8 to 0000001c
+  DW_CFA_advance_loc: 8 to 0+001c
   DW_CFA_offset: r28 at cfa-16
-  DW_CFA_advance_loc: 8 to 00000024
+  DW_CFA_advance_loc: 8 to 0+0024
   DW_CFA_offset: r29 at cfa-12
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-s390-1.d b/gas/testsuite/gas/cfi/cfi-s390-1.d
index 4ba11d4f61..5c7684e146 100644
--- a/gas/testsuite/gas/cfi/cfi-s390-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390-1.d
@@ -4,7 +4,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -14,8 +14,8 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r15 ofs 96
 
-00000014 00000024 00000018 FDE cie=00000000 pc=00000000..0000004e
-  DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0024 0+0018 FDE cie=0+0000 pc=0+0000..0+004e
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_offset: r15 at cfa-36
   DW_CFA_offset: r14 at cfa-40
   DW_CFA_offset: r13 at cfa-44
@@ -24,7 +24,7 @@ Contents of the .eh_frame section:
   DW_CFA_offset: r10 at cfa-56
   DW_CFA_offset: r9 at cfa-60
   DW_CFA_offset: r8 at cfa-64
-  DW_CFA_advance_loc: 22 to 0000001a
+  DW_CFA_advance_loc: 22 to 0+001a
   DW_CFA_def_cfa_offset: 192
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-s390x-1.d b/gas/testsuite/gas/cfi/cfi-s390x-1.d
index af076abd38..6ed5749424 100644
--- a/gas/testsuite/gas/cfi/cfi-s390x-1.d
+++ b/gas/testsuite/gas/cfi/cfi-s390x-1.d
@@ -4,7 +4,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -17,8 +17,8 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000024 0000001c FDE cie=00000000 pc=00000000..00000070
-  DW_CFA_advance_loc: 6 to 00000006
+0+0018 0+0024 0+001c FDE cie=0+0000 pc=0+0000..0+0070
+  DW_CFA_advance_loc: 6 to 0+0006
   DW_CFA_offset: r15 at cfa-40
   DW_CFA_offset: r14 at cfa-48
   DW_CFA_offset: r13 at cfa-56
@@ -27,7 +27,7 @@ Contents of the .eh_frame section:
   DW_CFA_offset: r10 at cfa-80
   DW_CFA_offset: r9 at cfa-88
   DW_CFA_offset: r8 at cfa-96
-  DW_CFA_advance_loc: 8 to 0000000e
+  DW_CFA_advance_loc: 8 to 0+000e
   DW_CFA_def_cfa_offset: 320
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-sh-1.d b/gas/testsuite/gas/cfi/cfi-sh-1.d
index b2ee634d1c..60dcf9bc20 100644
--- a/gas/testsuite/gas/cfi/cfi-sh-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sh-1.d
@@ -2,7 +2,7 @@
 #name: CFI on SH
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 2
@@ -12,16 +12,16 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r15 ofs 0
 
-00000014 00000020 00000018 FDE cie=00000000 pc=00000000..0000002c
-  DW_CFA_advance_loc: 2 to 00000002
+0+0014 0+0020 0+0018 FDE cie=0+0000 pc=0+0000..0+002c
+  DW_CFA_advance_loc: 2 to 0+0002
   DW_CFA_def_cfa_offset: 4
-  DW_CFA_advance_loc: 2 to 00000004
+  DW_CFA_advance_loc: 2 to 0+0004
   DW_CFA_def_cfa_offset: 8
   DW_CFA_offset: r15 at cfa-4
   DW_CFA_offset: r17 at cfa-8
-  DW_CFA_advance_loc: 6 to 0000000a
+  DW_CFA_advance_loc: 6 to 0+000a
   DW_CFA_def_cfa_register: r14
-  DW_CFA_advance_loc: 2 to 0000000c
+  DW_CFA_advance_loc: 2 to 0+000c
   DW_CFA_def_cfa_offset: 40
   DW_CFA_nop
   DW_CFA_nop
diff --git a/gas/testsuite/gas/cfi/cfi-sparc-1.d b/gas/testsuite/gas/cfi/cfi-sparc-1.d
index b4cd68dd22..d73f30b74a 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc-1.d
@@ -4,7 +4,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000010 00000000 CIE
+0+0000 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -14,8 +14,8 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r14 ofs 0
 
-00000014 00000014 00000018 FDE cie=00000000 pc=00000000..00000024
-  DW_CFA_advance_loc: 4 to 00000004
+0+0014 0+0014 0+0018 FDE cie=0+0000 pc=0+0000..0+0024
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_register: r30
   DW_CFA_GNU_window_save
   DW_CFA_register: r15 in r31
diff --git a/gas/testsuite/gas/cfi/cfi-sparc64-1.d b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
index 26dbe16a13..656ddd90bb 100644
--- a/gas/testsuite/gas/cfi/cfi-sparc64-1.d
+++ b/gas/testsuite/gas/cfi/cfi-sparc64-1.d
@@ -4,7 +4,7 @@
 
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 4
@@ -17,8 +17,8 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000030
-  DW_CFA_advance_loc: 4 to 00000004
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0030
+  DW_CFA_advance_loc: 4 to 0+0004
   DW_CFA_def_cfa_register: r30
   DW_CFA_GNU_window_save
   DW_CFA_register: r15 in r31
diff --git a/gas/testsuite/gas/cfi/cfi-x86_64.d b/gas/testsuite/gas/cfi/cfi-x86_64.d
index 22d14656d3..592416aee4 100644
--- a/gas/testsuite/gas/cfi/cfi-x86_64.d
+++ b/gas/testsuite/gas/cfi/cfi-x86_64.d
@@ -3,7 +3,7 @@
 #...
 Contents of the .eh_frame section:
 
-00000000 00000014 00000000 CIE
+0+0000 0+0014 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -16,42 +16,42 @@ Contents of the .eh_frame section:
   DW_CFA_nop
   DW_CFA_nop
 
-00000018 00000014 0000001c FDE cie=00000000 pc=00000000..00000014
-  DW_CFA_advance_loc: 7 to 00000007
+0+0018 0+0014 0+001c FDE cie=0+0000 pc=0+0000..0+0014
+  DW_CFA_advance_loc: 7 to 0+0007
   DW_CFA_def_cfa_offset: 4668
-  DW_CFA_advance_loc: 12 to 00000013
+  DW_CFA_advance_loc: 12 to 0+0013
   DW_CFA_def_cfa_offset: 8
 
-00000030 0000001c 00000034 FDE cie=00000000 pc=00000014..00000022
-  DW_CFA_advance_loc: 1 to 00000015
+0+0030 0+001c 0+0034 FDE cie=0+0000 pc=0+0014..0+0022
+  DW_CFA_advance_loc: 1 to 0+0015
   DW_CFA_def_cfa_offset: 16
   DW_CFA_offset: r6 \(rbp\) at cfa-16
-  DW_CFA_advance_loc: 3 to 00000018
+  DW_CFA_advance_loc: 3 to 0+0018
   DW_CFA_def_cfa_register: r6 \(rbp\)
-  DW_CFA_advance_loc: 9 to 00000021
+  DW_CFA_advance_loc: 9 to 0+0021
   DW_CFA_def_cfa: r7 \(rsp\) ofs 8
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000050 00000014 00000054 FDE cie=00000000 pc=00000022..00000035
-  DW_CFA_advance_loc: 3 to 00000025
+0+0050 0+0014 0+0054 FDE cie=0+0000 pc=0+0022..0+0035
+  DW_CFA_advance_loc: 3 to 0+0025
   DW_CFA_def_cfa_register: r8 \(r8\)
-  DW_CFA_advance_loc: 15 to 00000034
+  DW_CFA_advance_loc: 15 to 0+0034
   DW_CFA_def_cfa_register: r7 \(rsp\)
   DW_CFA_nop
 
-00000068 00000010 0000006c FDE cie=00000000 pc=00000035..0000003b
+0+0068 0+0010 0+006c FDE cie=0+0000 pc=0+0035..0+003b
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-0000007c 00000010 00000080 FDE cie=00000000 pc=0000003b..0000004d
+0+007c 0+0010 0+0080 FDE cie=0+0000 pc=0+003b..0+004d
   DW_CFA_nop
   DW_CFA_nop
   DW_CFA_nop
 
-00000090 00000010 00000000 CIE
+0+0090 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -61,30 +61,30 @@ Contents of the .eh_frame section:
 
   DW_CFA_def_cfa: r7 \(rsp\) ofs 8
 
-000000a4 0000002c 00000018 FDE cie=00000090 pc=0000004d..00000058
-  DW_CFA_advance_loc: 1 to 0000004e
+0+00a4 0+002c 0+0018 FDE cie=0+0090 pc=0+004d..0+0058
+  DW_CFA_advance_loc: 1 to 0+004e
   DW_CFA_def_cfa_offset: 16
-  DW_CFA_advance_loc: 1 to 0000004f
+  DW_CFA_advance_loc: 1 to 0+004f
   DW_CFA_def_cfa_register: r8 \(r8\)
-  DW_CFA_advance_loc: 1 to 00000050
+  DW_CFA_advance_loc: 1 to 0+0050
   DW_CFA_def_cfa_offset: 4676
-  DW_CFA_advance_loc: 1 to 00000051
+  DW_CFA_advance_loc: 1 to 0+0051
   DW_CFA_offset_extended_sf: r4 \(rsi\) at cfa\+16
-  DW_CFA_advance_loc: 1 to 00000052
+  DW_CFA_advance_loc: 1 to 0+0052
   DW_CFA_register: r8 \(r8\) in r9 \(r9\)
-  DW_CFA_advance_loc: 1 to 00000053
+  DW_CFA_advance_loc: 1 to 0+0053
   DW_CFA_remember_state
-  DW_CFA_advance_loc: 1 to 00000054
+  DW_CFA_advance_loc: 1 to 0+0054
   DW_CFA_restore: r6 \(rbp\)
-  DW_CFA_advance_loc: 1 to 00000055
+  DW_CFA_advance_loc: 1 to 0+0055
   DW_CFA_undefined: r16 \(rip\)
-  DW_CFA_advance_loc: 1 to 00000056
+  DW_CFA_advance_loc: 1 to 0+0056
   DW_CFA_same_value: r3 \(rbx\)
-  DW_CFA_advance_loc: 1 to 00000057
+  DW_CFA_advance_loc: 1 to 0+0057
   DW_CFA_restore_state
   DW_CFA_nop
 
-000000d4 00000010 00000000 CIE
+0+00d4 0+0010 0+0000 CIE
   Version:               1
   Augmentation:          "zR"
   Code alignment factor: 1
@@ -95,178 +95,178 @@ Contents of the .eh_frame section:
   DW_CFA_undefined: r16 \(rip\)
   DW_CFA_nop
 
-000000e8 0000011[04] 00000018 FDE cie=000000d4 pc=00000058..000000af
-  DW_CFA_advance_loc: 1 to 00000059
+0+00e8 0+011[04] 0+0018 FDE cie=0+00d4 pc=0+0058..0+00af
+  DW_CFA_advance_loc: 1 to 0+0059
   DW_CFA_undefined: r0 \(rax\)
-  DW_CFA_advance_loc: 1 to 0000005a
+  DW_CFA_advance_loc: 1 to 0+005a
   DW_CFA_undefined: r2 \(rcx\)
-  DW_CFA_advance_loc: 1 to 0000005b
+  DW_CFA_advance_loc: 1 to 0+005b
   DW_CFA_undefined: r1 \(rdx\)
-  DW_CFA_advance_loc: 1 to 0000005c
+  DW_CFA_advance_loc: 1 to 0+005c
   DW_CFA_undefined: r3 \(rbx\)
-  DW_CFA_advance_loc: 1 to 0000005d
+  DW_CFA_advance_loc: 1 to 0+005d
   DW_CFA_undefined: r7 \(rsp\)
-  DW_CFA_advance_loc: 1 to 0000005e
+  DW_CFA_advance_loc: 1 to 0+005e
   DW_CFA_undefined: r6 \(rbp\)
-  DW_CFA_advance_loc: 1 to 0000005f
+  DW_CFA_advance_loc: 1 to 0+005f
   DW_CFA_undefined: r4 \(rsi\)
-  DW_CFA_advance_loc: 1 to 00000060
+  DW_CFA_advance_loc: 1 to 0+0060
   DW_CFA_undefined: r5 \(rdi\)
-  DW_CFA_advance_loc: 1 to 00000061
+  DW_CFA_advance_loc: 1 to 0+0061
   DW_CFA_undefined: r8 \(r8\)
-  DW_CFA_advance_loc: 1 to 00000062
+  DW_CFA_advance_loc: 1 to 0+0062
   DW_CFA_undefined: r9 \(r9\)
-  DW_CFA_advance_loc: 1 to 00000063
+  DW_CFA_advance_loc: 1 to 0+0063
   DW_CFA_undefined: r10 \(r10\)
-  DW_CFA_advance_loc: 1 to 00000064
+  DW_CFA_advance_loc: 1 to 0+0064
   DW_CFA_undefined: r11 \(r11\)
-  DW_CFA_advance_loc: 1 to 00000065
+  DW_CFA_advance_loc: 1 to 0+0065
   DW_CFA_undefined: r12 \(r12\)
-  DW_CFA_advance_loc: 1 to 00000066
+  DW_CFA_advance_loc: 1 to 0+0066
   DW_CFA_undefined: r13 \(r13\)
-  DW_CFA_advance_loc: 1 to 00000067
+  DW_CFA_advance_loc: 1 to 0+0067
   DW_CFA_undefined: r14 \(r14\)
-  DW_CFA_advance_loc: 1 to 00000068
+  DW_CFA_advance_loc: 1 to 0+0068
   DW_CFA_undefined: r15 \(r15\)
-  DW_CFA_advance_loc: 1 to 00000069
+  DW_CFA_advance_loc: 1 to 0+0069
   DW_CFA_undefined: r49 \([er]flags\)
-  DW_CFA_advance_loc: 1 to 0000006a
+  DW_CFA_advance_loc: 1 to 0+006a
   DW_CFA_undefined: r50 \(es\)
-  DW_CFA_advance_loc: 1 to 0000006b
+  DW_CFA_advance_loc: 1 to 0+006b
   DW_CFA_undefined: r51 \(cs\)
-  DW_CFA_advance_loc: 1 to 0000006c
+  DW_CFA_advance_loc: 1 to 0+006c
   DW_CFA_undefined: r53 \(ds\)
-  DW_CFA_advance_loc: 1 to 0000006d
+  DW_CFA_advance_loc: 1 to 0+006d
   DW_CFA_undefined: r52 \(ss\)
-  DW_CFA_advance_loc: 1 to 0000006e
+  DW_CFA_advance_loc: 1 to 0+006e
   DW_CFA_undefined: r54 \(fs\)
-  DW_CFA_advance_loc: 1 to 0000006f
+  DW_CFA_advance_loc: 1 to 0+006f
   DW_CFA_undefined: r55 \(gs\)
-  DW_CFA_advance_loc: 1 to 00000070
+  DW_CFA_advance_loc: 1 to 0+0070
   DW_CFA_undefined: r62 \(tr\)
-  DW_CFA_advance_loc: 1 to 00000071
+  DW_CFA_advance_loc: 1 to 0+0071
   DW_CFA_undefined: r63 \(ldtr\)
-  DW_CFA_advance_loc: 1 to 00000072
+  DW_CFA_advance_loc: 1 to 0+0072
   DW_CFA_undefined: r58 \(fs\.base\)
-  DW_CFA_advance_loc: 1 to 00000073
+  DW_CFA_advance_loc: 1 to 0+0073
   DW_CFA_undefined: r59 \(gs\.base\)
-  DW_CFA_advance_loc: 1 to 00000074
+  DW_CFA_advance_loc: 1 to 0+0074
   DW_CFA_undefined: r64 \(mxcsr\)
-  DW_CFA_advance_loc: 1 to 00000075
+  DW_CFA_advance_loc: 1 to 0+0075
   DW_CFA_undefined: r17 \(xmm0\)
-  DW_CFA_advance_loc: 1 to 00000076
+  DW_CFA_advance_loc: 1 to 0+0076
   DW_CFA_undefined: r18 \(xmm1\)
-  DW_CFA_advance_loc: 1 to 00000077
+  DW_CFA_advance_loc: 1 to 0+0077
   DW_CFA_undefined: r19 \(xmm2\)
-  DW_CFA_advance_loc: 1 to 00000078
+  DW_CFA_advance_loc: 1 to 0+0078
   DW_CFA_undefined: r20 \(xmm3\)
-  DW_CFA_advance_loc: 1 to 00000079
+  DW_CFA_advance_loc: 1 to 0+0079
   DW_CFA_undefined: r21 \(xmm4\)
-  DW_CFA_advance_loc: 1 to 0000007a
+  DW_CFA_advance_loc: 1 to 0+007a
   DW_CFA_undefined: r22 \(xmm5\)
-  DW_CFA_advance_loc: 1 to 0000007b
+  DW_CFA_advance_loc: 1 to 0+007b
   DW_CFA_undefined: r23 \(xmm6\)
-  DW_CFA_advance_loc: 1 to 0000007c
+  DW_CFA_advance_loc: 1 to 0+007c
   DW_CFA_undefined: r24 \(xmm7\)
-  DW_CFA_advance_loc: 1 to 0000007d
+  DW_CFA_advance_loc: 1 to 0+007d
   DW_CFA_undefined: r25 \(xmm8\)
-  DW_CFA_advance_loc: 1 to 0000007e
+  DW_CFA_advance_loc: 1 to 0+007e
   DW_CFA_undefined: r26 \(xmm9\)
-  DW_CFA_advance_loc: 1 to 0000007f
+  DW_CFA_advance_loc: 1 to 0+007f
   DW_CFA_undefined: r27 \(xmm10\)
-  DW_CFA_advance_loc: 1 to 00000080
+  DW_CFA_advance_loc: 1 to 0+0080
   DW_CFA_undefined: r28 \(xmm11\)
-  DW_CFA_advance_loc: 1 to 00000081
+  DW_CFA_advance_loc: 1 to 0+0081
   DW_CFA_undefined: r29 \(xmm12\)
-  DW_CFA_advance_loc: 1 to 00000082
+  DW_CFA_advance_loc: 1 to 0+0082
   DW_CFA_undefined: r30 \(xmm13\)
-  DW_CFA_advance_loc: 1 to 00000083
+  DW_CFA_advance_loc: 1 to 0+0083
   DW_CFA_undefined: r31 \(xmm14\)
-  DW_CFA_advance_loc: 1 to 00000084
+  DW_CFA_advance_loc: 1 to 0+0084
   DW_CFA_undefined: r32 \(xmm15\)
-  DW_CFA_advance_loc: 1 to 00000085
+  DW_CFA_advance_loc: 1 to 0+0085
   DW_CFA_undefined: r65 \(fcw\)
-  DW_CFA_advance_loc: 1 to 00000086
+  DW_CFA_advance_loc: 1 to 0+0086
   DW_CFA_undefined: r66 \(fsw\)
-  DW_CFA_advance_loc: 1 to 00000087
+  DW_CFA_advance_loc: 1 to 0+0087
   DW_CFA_undefined: r33 \(st\(?0?\)?\)
-  DW_CFA_advance_loc: 1 to 00000088
+  DW_CFA_advance_loc: 1 to 0+0088
   DW_CFA_undefined: r34 \(st\(?1\)?\)
-  DW_CFA_advance_loc: 1 to 00000089
+  DW_CFA_advance_loc: 1 to 0+0089
   DW_CFA_undefined: r35 \(st\(?2\)?\)
-  DW_CFA_advance_loc: 1 to 0000008a
+  DW_CFA_advance_loc: 1 to 0+008a
   DW_CFA_undefined: r36 \(st\(?3\)?\)
-  DW_CFA_advance_loc: 1 to 0000008b
+  DW_CFA_advance_loc: 1 to 0+008b
   DW_CFA_undefined: r37 \(st\(?4\)?\)
-  DW_CFA_advance_loc: 1 to 0000008c
+  DW_CFA_advance_loc: 1 to 0+008c
   DW_CFA_undefined: r38 \(st\(?5\)?\)
-  DW_CFA_advance_loc: 1 to 0000008d
+  DW_CFA_advance_loc: 1 to 0+008d
   DW_CFA_undefined: r39 \(st\(?6\)?\)
-  DW_CFA_advance_loc: 1 to 0000008e
+  DW_CFA_advance_loc: 1 to 0+008e
   DW_CFA_undefined: r40 \(st\(?7\)?\)
-  DW_CFA_advance_loc: 1 to 0000008f
+  DW_CFA_advance_loc: 1 to 0+008f
   DW_CFA_undefined: r41 \(mm0\)
-  DW_CFA_advance_loc: 1 to 00000090
+  DW_CFA_advance_loc: 1 to 0+0090
   DW_CFA_undefined: r42 \(mm1\)
-  DW_CFA_advance_loc: 1 to 00000091
+  DW_CFA_advance_loc: 1 to 0+0091
   DW_CFA_undefined: r43 \(mm2\)
-  DW_CFA_advance_loc: 1 to 00000092
+  DW_CFA_advance_loc: 1 to 0+0092
   DW_CFA_undefined: r44 \(mm3\)
-  DW_CFA_advance_loc: 1 to 00000093
+  DW_CFA_advance_loc: 1 to 0+0093
   DW_CFA_undefined: r45 \(mm4\)
-  DW_CFA_advance_loc: 1 to 00000094
+  DW_CFA_advance_loc: 1 to 0+0094
   DW_CFA_undefined: r46 \(mm5\)
-  DW_CFA_advance_loc: 1 to 00000095
+  DW_CFA_advance_loc: 1 to 0+0095
   DW_CFA_undefined: r47 \(mm6\)
-  DW_CFA_advance_loc: 1 to 00000096
+  DW_CFA_advance_loc: 1 to 0+0096
   DW_CFA_undefined: r48 \(mm7\)
-  DW_CFA_advance_loc: 1 to 00000097
+  DW_CFA_advance_loc: 1 to 0+0097
   DW_CFA_undefined: r67 \(xmm16\)
-  DW_CFA_advance_loc: 1 to 00000098
+  DW_CFA_advance_loc: 1 to 0+0098
   DW_CFA_undefined: r68 \(xmm17\)
-  DW_CFA_advance_loc: 1 to 00000099
+  DW_CFA_advance_loc: 1 to 0+0099
   DW_CFA_undefined: r69 \(xmm18\)
-  DW_CFA_advance_loc: 1 to 0000009a
+  DW_CFA_advance_loc: 1 to 0+009a
   DW_CFA_undefined: r70 \(xmm19\)
-  DW_CFA_advance_loc: 1 to 0000009b
+  DW_CFA_advance_loc: 1 to 0+009b
   DW_CFA_undefined: r71 \(xmm20\)
-  DW_CFA_advance_loc: 1 to 0000009c
+  DW_CFA_advance_loc: 1 to 0+009c
   DW_CFA_undefined: r72 \(xmm21\)
-  DW_CFA_advance_loc: 1 to 0000009d
+  DW_CFA_advance_loc: 1 to 0+009d
   DW_CFA_undefined: r73 \(xmm22\)
-  DW_CFA_advance_loc: 1 to 0000009e
+  DW_CFA_advance_loc: 1 to 0+009e
   DW_CFA_undefined: r74 \(xmm23\)
-  DW_CFA_advance_loc: 1 to 0000009f
+  DW_CFA_advance_loc: 1 to 0+009f
   DW_CFA_undefined: r75 \(xmm24\)
-  DW_CFA_advance_loc: 1 to 000000a0
+  DW_CFA_advance_loc: 1 to 0+00a0
   DW_CFA_undefined: r76 \(xmm25\)
-  DW_CFA_advance_loc: 1 to 000000a1
+  DW_CFA_advance_loc: 1 to 0+00a1
   DW_CFA_undefined: r77 \(xmm26\)
-  DW_CFA_advance_loc: 1 to 000000a2
+  DW_CFA_advance_loc: 1 to 0+00a2
   DW_CFA_undefined: r78 \(xmm27\)
-  DW_CFA_advance_loc: 1 to 000000a3
+  DW_CFA_advance_loc: 1 to 0+00a3
   DW_CFA_undefined: r79 \(xmm28\)
-  DW_CFA_advance_loc: 1 to 000000a4
+  DW_CFA_advance_loc: 1 to 0+00a4
   DW_CFA_undefined: r80 \(xmm29\)
-  DW_CFA_advance_loc: 1 to 000000a5
+  DW_CFA_advance_loc: 1 to 0+00a5
   DW_CFA_undefined: r81 \(xmm30\)
-  DW_CFA_advance_loc: 1 to 000000a6
+  DW_CFA_advance_loc: 1 to 0+00a6
   DW_CFA_undefined: r82 \(xmm31\)
-  DW_CFA_advance_loc: 1 to 000000a7
+  DW_CFA_advance_loc: 1 to 0+00a7
   DW_CFA_undefined: r118 \(k0\)
-  DW_CFA_advance_loc: 1 to 000000a8
+  DW_CFA_advance_loc: 1 to 0+00a8
   DW_CFA_undefined: r119 \(k1\)
-  DW_CFA_advance_loc: 1 to 000000a9
+  DW_CFA_advance_loc: 1 to 0+00a9
   DW_CFA_undefined: r120 \(k2\)
-  DW_CFA_advance_loc: 1 to 000000aa
+  DW_CFA_advance_loc: 1 to 0+00aa
   DW_CFA_undefined: r121 \(k3\)
-  DW_CFA_advance_loc: 1 to 000000ab
+  DW_CFA_advance_loc: 1 to 0+00ab
   DW_CFA_undefined: r122 \(k4\)
-  DW_CFA_advance_loc: 1 to 000000ac
+  DW_CFA_advance_loc: 1 to 0+00ac
   DW_CFA_undefined: r123 \(k5\)
-  DW_CFA_advance_loc: 1 to 000000ad
+  DW_CFA_advance_loc: 1 to 0+00ad
   DW_CFA_undefined: r124 \(k6\)
-  DW_CFA_advance_loc: 1 to 000000ae
+  DW_CFA_advance_loc: 1 to 0+00ae
   DW_CFA_undefined: r125 \(k7\)
   DW_CFA_nop
   DW_CFA_nop