[obj2yaml, yaml2obj] Use Hex64 for BBAddressMap fields.

[rahmanl]

Summary

This patch let the yaml encoding use Hex64 values for NumBlocks, BB AddressOffset, BB Size, and BB Metadata.
Additionally, it changes the decoded values in elf2yaml to uint64_t to match DataExtractor::getULEB128 return type.

[jhenderson]

LGTM.

llvm/include/llvm/ObjectYAML/ELFYAML.h

 
 struct DynamicEntry {
   ELF_DYNTAG Tag;
   llvm::yaml::Hex64 Val;
 };
 
 struct BBAddrMapEntry {
   struct BBEntry {
-    llvm::yaml::Hex32 AddressOffset;
-    llvm::yaml::Hex32 Size;
-    llvm::yaml::Hex32 Metadata;
+    llvm::yaml::Hex64 AddressOffset;
+    llvm::yaml::Hex64 Size;
+    llvm::yaml::Hex64 Metadata;
   };
   llvm::yaml::Hex64 Address;
   Optional<std::vector<BBEntry>> BBEntries;
 };
 
 struct StackSizeEntry {
   llvm::yaml::Hex64 Address;
   llvm::yaml::Hex64 Size;

llvm/test/tools/obj2yaml/ELF/bb-addr-map.yaml

 ## The 'Address' field is omitted when it's zero.
 # VALID-NEXT:         BBEntries:
 # VALID-NEXT:           - AddressOffset:    0x1
 # VALID-NEXT:             Size:             0x2
 # VALID-NEXT:             Metadata:         0x3
 # VALID-NEXT:           - AddressOffset:    0x4
 # VALID-NEXT:             Size:             0x5
 # VALID-NEXT:             Metadata:         0x6
-# VALID-NEXT:           - AddressOffset:    0x7
-# VALID-NEXT:             Size:             0x8
-# VALID-NEXT:             Metadata:         0x9
-# VALID-NEXT:       - Address:   0x20
+# VALID-NEXT:           - AddressOffset:    0xFFFFFFFFFFFFFFF7
+# VALID-NEXT:             Size:             0xFFFFFFFFFFFFFFF8
+# VALID-NEXT:             Metadata:         0xFFFFFFFFFFFFFFF9
+# VALID-NEXT:       - Address:   0xFFFFFFFFFFFFFF20
 # VALID-NEXT:         BBEntries:
 # VALID-NEXT:           - AddressOffset:    0xA
 # VALID-NEXT:             Size:             0xB
 # VALID-NEXT:             Metadata:         0xC
 
 --- !ELF
 FileHeader:
   Class: ELFCLASS64
   Data:  ELFDATA2LSB
   Type:  ET_EXEC
 Sections:
   - Name:    .llvm_bb_addr_map
     Type:    SHT_LLVM_BB_ADDR_MAP
     Entries:
       - Address:   0x0
         BBEntries:
           - AddressOffset:    0x1
             Size:             0x2
             Metadata:         0x3
           - AddressOffset:    0x4
             Size:             0x5
             Metadata:         0x6
-          - AddressOffset:    0x7
-            Size:             0x8
-            Metadata:         0x9
-      - Address:   0x20
+          - AddressOffset:    0xFFFFFFFFFFFFFFF7
+            Size:             0xFFFFFFFFFFFFFFF8
+            Metadata:         0xFFFFFFFFFFFFFFF9
+      - Address:   0xFFFFFFFFFFFFFF20
         BBEntries:
           - AddressOffset:    0xA
             Size:             0xB
             Metadata:         0xC
 
 ## Check that obj2yaml uses the "Content" tag to describe an .llvm_bb_addr_map section
 ## when it can't extract the entries. For instance, when truncated data is given as
 ## 'Content'.

llvm/tools/obj2yaml/elf2yaml.cpp

if (Content.empty())
     return S.release();
 
   DataExtractor Data(Content, Obj.isLE(), ELFT::Is64Bits ? 8 : 4);
 
   std::vector<ELFYAML::BBAddrMapEntry> Entries;
   DataExtractor::Cursor Cur(0);
   while (Cur && Cur.tell() < Content.size()) {
     uint64_t Address = Data.getAddress(Cur);
-    uint32_t NumBlocks = Data.getULEB128(Cur);
+    uint64_t NumBlocks = Data.getULEB128(Cur);
     std::vector<ELFYAML::BBAddrMapEntry::BBEntry> BBEntries;
     // Read the specified number of BB entries, or until decoding fails.
-    for (uint32_t BlockID = 0; Cur && BlockID < NumBlocks; ++BlockID) {
-      uint32_t Offset = Data.getULEB128(Cur);
-      uint32_t Size = Data.getULEB128(Cur);
-      uint32_t Metadata = Data.getULEB128(Cur);
+    for (uint64_t BlockID = 0; Cur && BlockID < NumBlocks; ++BlockID) {
+      uint64_t Offset = Data.getULEB128(Cur);
+      uint64_t Size = Data.getULEB128(Cur);
+      uint64_t Metadata = Data.getULEB128(Cur);
       BBEntries.push_back({Offset, Size, Metadata});
     }
     Entries.push_back({Address, BBEntries});
   }
 
   if (!Cur) {
     // If the section cannot be decoded, we dump it as an array of bytes.
     consumeError(Cur.takeError());