binutils: rename ar_pointer_size

The field is named "address size" in all versions of the DWARF spec
that have and name the field.  Reflect that by renaming
ar_pointer_size to ar_address_size.

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 42e538805ece4fb222f61dc460ef3912425a8783..46499ac243603a5562a47ae536bde2420f35341b 100644 (file)
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -9057,7 +9057,7 @@ display_debug_aranges (struct dwarf_section *section,
                " in %s section does not point to a CU header.\n"),
              arange.ar_info_offset, section->name);
 
-      SAFE_BYTE_GET_AND_INC (arange.ar_pointer_size, hdrptr, 1, end_ranges);
+      SAFE_BYTE_GET_AND_INC (arange.ar_address_size, hdrptr, 1, end_ranges);
       SAFE_BYTE_GET_AND_INC (arange.ar_segment_size, hdrptr, 1, end_ranges);
 
       if (arange.ar_version != 2 && arange.ar_version != 3)
@@ -9075,14 +9075,14 @@ display_debug_aranges (struct dwarf_section *section,
       printf (_("  Version:                  %d\n"), arange.ar_version);
       printf (_("  Offset into .debug_info:  %#" PRIx64 "\n"),
              arange.ar_info_offset);
-      printf (_("  Pointer Size:             %d\n"), arange.ar_pointer_size);
+      printf (_("  Pointer Size:             %d\n"), arange.ar_address_size);
       printf (_("  Segment Size:             %d\n"), arange.ar_segment_size);
 
-      if (!address_size_ok (section->name, arange.ar_pointer_size,
+      if (!address_size_ok (section->name, arange.ar_address_size,
                            arange.ar_segment_size))
        break;
 
-      tuple_size = 2 * arange.ar_pointer_size + arange.ar_segment_size;
+      tuple_size = 2 * arange.ar_address_size + arange.ar_segment_size;
 
       if (tuple_size > 8)
        printf (_("\n    Address            Length\n"));
@@ -9096,13 +9096,13 @@ display_debug_aranges (struct dwarf_section *section,
 
       while (tuple_size <= end_ranges - addr_ranges)
        {
-         SAFE_BYTE_GET_AND_INC (address, addr_ranges, arange.ar_pointer_size,
+         SAFE_BYTE_GET_AND_INC (address, addr_ranges, arange.ar_address_size,
                                 end_ranges);
-         SAFE_BYTE_GET_AND_INC (length, addr_ranges, arange.ar_pointer_size,
+         SAFE_BYTE_GET_AND_INC (length, addr_ranges, arange.ar_address_size,
                                 end_ranges);
          printf ("    ");
-         print_hex (address, arange.ar_pointer_size);
-         print_hex_ns (length, arange.ar_pointer_size);
+         print_hex (address, arange.ar_address_size);
+         print_hex_ns (length, arange.ar_address_size);
          putchar ('\n');
        }
 

diff --git a/binutils/dwarf.h b/binutils/dwarf.h
index 45618d7a94b72e8bac50bd00304ca339c4a18540..3ab25933052824e9b1561c2c369aebe9050c3ccd 100644 (file)
--- a/binutils/dwarf.h
+++ b/binutils/dwarf.h
@@ -66,7 +66,7 @@ typedef struct
   uint64_t      ar_length;
   unsigned short ar_version;
   uint64_t      ar_info_offset;
-  unsigned char  ar_pointer_size;
+  unsigned char  ar_address_size;
   unsigned char  ar_segment_size;
 }
 DWARF2_Internal_ARange;