[DWARFYAML][debug_addr] Use unsigned integer in Length, Version, etc. NFC.

[Higuoxing]

Summary

This patch doesn't make a big difference. But it will be easier for us to read values from these fields once obj2yaml supports dumping this section.

[Higuoxing]

Update.

[jhenderson]

llvm/include/llvm/ObjectYAML/DWARFYAML.h

170

I think length fields are generally better represented as hex, not decimal, so I wouldn't change those. I don't care much either way for the other fields.

[Higuoxing]

Currently, obj2yaml doesn't support the .debug_addr section. Abandon.

llvm/include/llvm/ObjectYAML/DWARFYAML.h

 
 struct SegAddrPair {
   yaml::Hex64 Segment;
   yaml::Hex64 Address;
 };
 
 struct AddrTableEntry {
   dwarf::DwarfFormat Format;
-  Optional<yaml::Hex64> Length;
-  yaml::Hex16 Version;
-  Optional<yaml::Hex8> AddrSize;
-  yaml::Hex8 SegSelectorSize;
+  Optional<uint64_t> Length;
+  uint16_t Version;
+  Optional<uint8_t> AddrSize;
+  uint8_t SegSelectorSize;
   std::vector<SegAddrPair> SegAddrPairs;
 };
 
 struct Data {
   bool IsLittleEndian;
   bool Is64bit;
   std::vector<Abbrev> AbbrevDecls;
   std::vector<StringRef> DebugStrings;

llvm/lib/ObjectYAML/DWARFEmitter.cpp

for (const AddrTableEntry &TableEntry : DI.DebugAddr) {
     uint8_t AddrSize;
     if (TableEntry.AddrSize)
       AddrSize = *TableEntry.AddrSize;
     else
       AddrSize = DI.Is64bit ? 8 : 4;
 
     uint64_t Length;
     if (TableEntry.Length)
-      Length = (uint64_t)*TableEntry.Length;
+      Length = *TableEntry.Length;
     else
       // 2 (version) + 1 (address_size) + 1 (segment_selector_size) = 4
       Length = 4 + (AddrSize + TableEntry.SegSelectorSize) *
                        TableEntry.SegAddrPairs.size();
 
     writeInitialLength(TableEntry.Format, Length, OS, DI.IsLittleEndian);
     writeInteger((uint16_t)TableEntry.Version, OS, DI.IsLittleEndian);
     writeInteger((uint8_t)AddrSize, OS, DI.IsLittleEndian);

llvm/test/tools/yaml2obj/ELF/DWARF/debug-addr.yaml

FileHeader:
   Class:   ELFCLASS64
   Data:    [[ENDIAN]]
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_addr:
     ## 1) Only address (4-byte) exists.
     - Version:     5
-      AddressSize: 0x04
+      AddressSize: 4
       Entries:
         - Address: 0x1234
         - Address: 0x5678
     ## 2) Only address (8-byte) exists (AddressSize is derived from FileHeader).
     - Version: 5
       Entries:
         - Address: 0x4321
         - Address: 0x8765
     ## 3) Only segment (4-byte) exists.
     - Version:             5
-      AddressSize:         0x00
-      SegmentSelectorSize: 0x04
+      AddressSize:         0
+      SegmentSelectorSize: 4
       Entries:
         - Segment: 0x1234
         - Segment: 0x5678
     ## 4) Only segment (8-byte) exists.
     - Version:             5
-      AddressSize:         0x00
-      SegmentSelectorSize: 0x08
+      AddressSize:         0
+      SegmentSelectorSize: 8
       Entries:
         - Segment: 0x4321
         - Segment: 0x8765
     ## 5) Both address (4-byte) and segment (4-byte) exist.
     - Version:             5
-      AddressSize:         0x04
-      SegmentSelectorSize: 0x04
+      AddressSize:         4
+      SegmentSelectorSize: 4
       Entries:
         - Segment: 0x1234
           Address: 0x5678
         - Segment: 0x4321
           ## Segment exists, while address takes the default value 0x00.
         - Address: 0x4321
           ## Address exists, while segment takes the default value 0x00.
     ## 6) Both address (8-byte) and segment (8-byte) exist (AddressSize is derived from FileHeader).
     - Version:             5
-      SegmentSelectorSize: 0x08
+      SegmentSelectorSize: 8
       Entries:
         - Segment: 0x1234
           Address: 0x5678
         - Segment: 0x4321
           ## Segment exists, while address takes the default value 0x00.
         - Address: 0x4321
           ## Address exists, while segment takes the default value 0x00.
     ## 7) Both address (4-byte) and segment (8-byte) exist.
     - Version:             5
-      AddressSize:         0x04
-      SegmentSelectorSize: 0x08
+      AddressSize:         4
+      SegmentSelectorSize: 8
       Entries:
         - Segment: 0x1234
           Address: 0x5678
         - Segment: 0x4321
           ## Segment exists, while address takes the default value 0x00.
         - Address: 0x4321
           ## Address exists, while segment takes the default value 0x00.
     ## 8) Both address (8-byte) and segment (4-byte) exist (AddressSize is derived from FileHeader).
     - Version:             5
-      SegmentSelectorSize: 0x04
+      SegmentSelectorSize: 4
       Entries:
         - Segment: 0x1234
           Address: 0x5678
         - Segment: 0x4321
           ## Segment exists, while address takes the default value 0x00.
         - Address: 0x4321
           ## Address exists, while segment takes the default value 0x00.
     ## 9) Explicitly assign a value to 'Length'.
-    - Length:              0x1234
-      Version:             0x02
-      AddressSize:         0x04
-      SegmentSelectorSize: 0x00
+    - Length:              4660 ## 0x1234
+      Version:             2
+      AddressSize:         4
+      SegmentSelectorSize: 0
       Entries:             []
 
 ## b) Generate and verify a big endian DWARF32 .debug_addr section.
 
 # RUN: yaml2obj --docnum=1 -DENDIAN=ELFDATA2MSB %s -o %t1.dwarf32.be.o
 # RUN: llvm-readobj --sections --section-data %t1.dwarf32.be.o | \
 # RUN:   FileCheck %s -DSIZE=264 -DADDRALIGN=1 --check-prefixes=SHDR,DWARF32-BE
 
FileHeader:
   Class:   ELFCLASS64
   Data:    [[ENDIAN]]
   Type:    ET_EXEC
   Machine: EM_X86_64
 DWARF:
   debug_addr:
     - Format:      DWARF64
       Version:     5
-      AddressSize: 0x04
+      AddressSize: 4
       Entries:
         - Address: 0x1234
         - Address: 0x5678
     - Format:   DWARF64
       Version:  5
       Entries:
         - Address: 0x4321
         - Address: 0x8765