[06/10] [COFF] Add a ResourceSectionRef method for getting resource contents

[mstorsjo]

Summary

This allows llvm-readobj to print the contents of each resource when printing resources from an object file or executable, like it already does for plain .res files.

This requires providing the whole COFFObjectFile to ResourceSectionRef.

This supports both object files and executables. For executables, the DataRVA field is used as is to look up the right section.

For object files, ideally we would need to complete linking of them and fix up all relocations to know what the DataRVA field would end up being. In practice, the only thing that makes sense for an RVA field is an ADDR32NB relocation. Thus, find a relocation pointing at this field, verify that it has the expected type, locate the symbol it points at, look up the section the symbol points at, and read from the right offset in that section.

This works both for GNU windres object files (which use one single .rsrc section, with all relocations against the base of the .rsrc section, with the original value of the DataRVA field being the offset of the data from the beginning of the .rsrc section) and cvtres object files (with two separate .rsrc$01 and .rsrc$02 sections, and one symbol per data entry, with the original pre-relocated DataRVA field being set to zero).

[thakis]

lgtm, nice.

llvm/test/tools/llvm-cvtres/combined.test

37

These Data ( sections here print data, but since the next line says CHECK instead of CHECK-NEXT we just don't print hit here, right?

[mstorsjo]

llvm/test/tools/llvm-cvtres/combined.test

37

Yes, I didn't want to bloat the test with all the bulk raw data here. I kept one entry at the top of coff-resources.test where I have a check for the full printout.

llvm/include/llvm/Object/COFF.h

   uint32_t Index;
 };
 
 class ResourceSectionRef {
 public:
   ResourceSectionRef() = default;
   explicit ResourceSectionRef(StringRef Ref) : BBS(Ref, support::little) {}
 
+  Error load(const COFFObjectFile *O);
+  Error load(const COFFObjectFile *O, const SectionRef &S);
+
   Expected<ArrayRef<UTF16>>
   getEntryNameString(const coff_resource_dir_entry &Entry);
   Expected<const coff_resource_dir_table &>
   getEntrySubDir(const coff_resource_dir_entry &Entry);
   Expected<const coff_resource_data_entry &>
   getEntryData(const coff_resource_dir_entry &Entry);
   Expected<const coff_resource_dir_table &> getBaseTable();
   Expected<const coff_resource_dir_entry &>
   getTableEntry(const coff_resource_dir_table &Table, uint32_t Index);
 
+  Expected<StringRef> getContents(const coff_resource_data_entry &Entry);
+
 private:
   BinaryByteStream BBS;
 
+  SectionRef Section;
+  const COFFObjectFile *Obj;
+
+  std::vector<const coff_relocation *> Relocs;
+
   Expected<const coff_resource_dir_table &> getTableAtOffset(uint32_t Offset);
   Expected<const coff_resource_dir_entry &>
   getTableEntryAtOffset(uint32_t Offset);
   Expected<const coff_resource_data_entry &>
   getDataEntryAtOffset(uint32_t Offset);
   Expected<ArrayRef<UTF16>> getDirStringAtOffset(uint32_t Offset);
 };
 

llvm/lib/Object/COFFObjectFile.cpp

                                   uint32_t Index) {
   if (Index >= (uint32_t)(Table.NumberOfNameEntries + Table.NumberOfIDEntries))
     return createStringError(object_error::parse_failed, "index out of range");
   const uint8_t *TablePtr = reinterpret_cast<const uint8_t *>(&Table);
   ptrdiff_t TableOffset = TablePtr - BBS.data().data();
   return getTableEntryAtOffset(TableOffset + sizeof(Table) +
                                Index * sizeof(coff_resource_dir_entry));
 }
+
+Error ResourceSectionRef::load(const COFFObjectFile *O) {
+  for (const SectionRef &S : O->sections()) {
+    Expected<StringRef> Name = S.getName();
+    if (!Name)
+      return Name.takeError();
+
+    if (*Name == ".rsrc" || *Name == ".rsrc$01")
+      return load(O, S);
+  }
+  return createStringError(object_error::parse_failed,
+                           "no resource section found");
+}
+
+Error ResourceSectionRef::load(const COFFObjectFile *O, const SectionRef &S) {
+  Obj = O;
+  Section = S;
+  Expected<StringRef> Contents = Section.getContents();
+  if (!Contents)
+    return Contents.takeError();
+  BBS = BinaryByteStream(*Contents, support::little);
+  const coff_section *COFFSect = Obj->getCOFFSection(Section);
+  ArrayRef<coff_relocation> OrigRelocs = Obj->getRelocations(COFFSect);
+  Relocs.reserve(OrigRelocs.size());
+  for (const coff_relocation &R : OrigRelocs)
+    Relocs.push_back(&R);
+  std::sort(Relocs.begin(), Relocs.end(),
+            [](const coff_relocation *A, const coff_relocation *B) {
+              return A->VirtualAddress < B->VirtualAddress;
+            });
+  return Error::success();
+}
+
+Expected<StringRef>
+ResourceSectionRef::getContents(const coff_resource_data_entry &Entry) {
+  if (!Obj)
+    return createStringError(object_error::parse_failed, "no object provided");
+
+  // Find a potential relocation at the DataRVA field (first member of
+  // the coff_resource_data_entry struct).
+  const uint8_t *EntryPtr = reinterpret_cast<const uint8_t *>(&Entry);
+  ptrdiff_t EntryOffset = EntryPtr - BBS.data().data();
+  coff_relocation RelocTarget{ulittle32_t(EntryOffset), ulittle32_t(0),
+                              ulittle16_t(0)};
+  auto RelocsForOffset =
+      std::equal_range(Relocs.begin(), Relocs.end(), &RelocTarget,
+                       [](const coff_relocation *A, const coff_relocation *B) {
+                         return A->VirtualAddress < B->VirtualAddress;
+                       });
+
+  if (RelocsForOffset.first != RelocsForOffset.second) {
+    // We found a relocation with the right offset. Check that it does have
+    // the expected type.
+    const coff_relocation &R = **RelocsForOffset.first;
+    uint16_t RVAReloc;
+    switch (Obj->getMachine()) {
+    case COFF::IMAGE_FILE_MACHINE_I386:
+      RVAReloc = COFF::IMAGE_REL_I386_DIR32NB;
+      break;
+    case COFF::IMAGE_FILE_MACHINE_AMD64:
+      RVAReloc = COFF::IMAGE_REL_AMD64_ADDR32NB;
+      break;
+    case COFF::IMAGE_FILE_MACHINE_ARMNT:
+      RVAReloc = COFF::IMAGE_REL_ARM_ADDR32NB;
+      break;
+    case COFF::IMAGE_FILE_MACHINE_ARM64:
+      RVAReloc = COFF::IMAGE_REL_ARM64_ADDR32NB;
+      break;
+    default:
+      return createStringError(object_error::parse_failed,
+                               "unsupported architecture");
+    }
+    if (R.Type != RVAReloc)
+      return createStringError(object_error::parse_failed,
+                               "unexpected relocation type");
+    // Get the relocation's symbol
+    Expected<COFFSymbolRef> Sym = Obj->getSymbol(R.SymbolTableIndex);
+    if (!Sym)
+      return Sym.takeError();
+    const coff_section *Section = nullptr;
+    // And the symbol's section
+    if (std::error_code EC = Obj->getSection(Sym->getSectionNumber(), Section))
+      return errorCodeToError(EC);
+    // Add the initial value of DataRVA to the symbol's offset to find the
+    // data it points at.
+    uint64_t Offset = Entry.DataRVA + Sym->getValue();
+    ArrayRef<uint8_t> Contents;
+    if (Error E = Obj->getSectionContents(Section, Contents))
+      return std::move(E);
+    if (Offset + Entry.DataSize > Contents.size())
+      return createStringError(object_error::parse_failed,
+                               "data outside of section");
+    // Return a reference to the data inside the section.
+    return StringRef(reinterpret_cast<const char *>(Contents.data()) + Offset,
+                     Entry.DataSize);
+  } else {
+    // Relocatable objects need a relocation for the DataRVA field.
+    if (Obj->isRelocatableObject())
+      return createStringError(object_error::parse_failed,
+                               "no relocation found for DataRVA");
+
+    // Locate the section that contains the address that DataRVA points at.
+    uint64_t VA = Entry.DataRVA + Obj->getImageBase();
+    for (const SectionRef &S : Obj->sections()) {
+      if (VA >= S.getAddress() &&
+          VA + Entry.DataSize <= S.getAddress() + S.getSize()) {
+        uint64_t Offset = VA - S.getAddress();
+        Expected<StringRef> Contents = S.getContents();
+        if (!Contents)
+          return Contents.takeError();
+        return Contents->slice(Offset, Offset + Entry.DataSize);
+      }
+    }
+    return createStringError(object_error::parse_failed,
+                             "address not found in image");
+  }
+}

llvm/test/tools/llvm-cvtres/combined.test

 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 57
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: BITMAP (ID 2) [
 CHECK-NEXT:    Table Offset: 0x58
 CHECK-NEXT:    Number of String Entries: 2
 CHECK-NEXT:    Number of ID Entries: 0
 CHECK-NEXT:    Name: CURSOR [
 CHECK-NEXT:      Table Offset: 0x100
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1E8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 808
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: OKAY [
 CHECK-NEXT:      Table Offset: 0x118
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1F8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 808
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: MENU (ID 4) [
 CHECK-NEXT:    Table Offset: 0x78
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 1
 CHECK-NEXT:    Name: "EAT" [
 CHECK-NEXT:      Table Offset: 0x130
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 3081) [
 CHECK-NEXT:        Entry Offset: 0x208
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 48
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: (ID 14432) [
 CHECK-NEXT:      Table Offset: 0x148
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 2052) [
 CHECK-NEXT:        Entry Offset: 0x218
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 46
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: DIALOG (ID 5) [
 CHECK-NEXT:    Table Offset: 0x98
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 0
 CHECK-NEXT:    Name: TESTDIALOG [
 CHECK-NEXT:      Table Offset: 0x160
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x228
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 108
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: ACCELERATOR (ID 9) [
 CHECK-NEXT:    Table Offset: 0xB0
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 1
 CHECK-NEXT:    Name: MYACCELERATORS [
 CHECK-NEXT:      Table Offset: 0x178
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 2
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x238
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 24
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:      Language: (ID 2052) [
 CHECK-NEXT:        Entry Offset: 0x248
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 24
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: (ID 12) [
 CHECK-NEXT:      Table Offset: 0x198
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x258
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 24
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: RCDATA (ID 10) [
 CHECK-NEXT:    Table Offset: 0xD0
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 0
 CHECK-NEXT:    Name: RANDOMDAT [
 CHECK-NEXT:      Table Offset: 0x1B0
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 3
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x268
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 54
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:      Language: (ID 2052) [
 CHECK-NEXT:        Entry Offset: 0x278
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 67
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:      Language: (ID 4103) [
 CHECK-NEXT:        Entry Offset: 0x288
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 66
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-DAG:    .rsrc$02 Data (
 CHECK-NEXT:     0000: 74686973 20697320 61207261 6E646F6D  |this is a random|
 CHECK-NEXT:     0010: 20626974 206F6620 64617461 20746861  | bit of data tha|
 CHECK-NEXT:     0020: 74206D65 616E7320 6E6F7468 696E6700  |t means nothing.|

llvm/test/tools/llvm-cvtres/object.test

 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 57
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: BITMAP (ID 2) [
 CHECK-NEXT:    Table Offset: 0x50
 CHECK-NEXT:    Number of String Entries: 2
 CHECK-NEXT:    Number of ID Entries: 0
 CHECK-NEXT:    Name: CURSOR [
 CHECK-NEXT:      Table Offset: 0xE0
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x198
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 808
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: OKAY [
 CHECK-NEXT:      Table Offset: 0xF8
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1A8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 808
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: MENU (ID 4) [
 CHECK-NEXT:    Table Offset: 0x70
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 1
 CHECK-NEXT:    Name: "EAT" [
 CHECK-NEXT:      Table Offset: 0x110
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 3081) [
 CHECK-NEXT:        Entry Offset: 0x1B8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 48
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: (ID 14432) [
 CHECK-NEXT:      Table Offset: 0x128
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 2052) [
 CHECK-NEXT:        Entry Offset: 0x1C8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 46
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: DIALOG (ID 5) [
 CHECK-NEXT:    Table Offset: 0x90
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 0
 CHECK-NEXT:    Name: TESTDIALOG [
 CHECK-NEXT:      Table Offset: 0x140
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1D8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 108
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-NEXT:  Type: ACCELERATOR (ID 9) [
 CHECK-NEXT:    Table Offset: 0xA8
 CHECK-NEXT:    Number of String Entries: 1
 CHECK-NEXT:    Number of ID Entries: 1
 CHECK-NEXT:    Name: MYACCELERATORS [
 CHECK-NEXT:      Table Offset: 0x158
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1E8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 24
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:    Name: (ID 12) [
 CHECK-NEXT:      Table Offset: 0x170
 CHECK-NEXT:      Number of String Entries: 0
 CHECK-NEXT:      Number of ID Entries: 1
 CHECK-NEXT:      Language: (ID 1033) [
 CHECK-NEXT:        Entry Offset: 0x1F8
 CHECK-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 CHECK-NEXT:        Major Version: 0
 CHECK-NEXT:        Minor Version: 0
 CHECK-NEXT:        Characteristics: 0
 CHECK-NEXT:        Data [
 CHECK-NEXT:          DataRVA: 0x0
 CHECK-NEXT:          DataSize: 24
 CHECK-NEXT:          Codepage: 0
 CHECK-NEXT:          Reserved: 0
+CHECK-NEXT:          Data (
+CHECK:               )
 CHECK-NEXT:        ]
 CHECK-NEXT:      ]
 CHECK-NEXT:    ]
 CHECK-NEXT:  ]
 CHECK-DAG:   .rsrc$02 Data (
 CHECK-NEXT:    0000: 11000300 E7030000 0D004400 4C040000  |..........D.L...|
 CHECK-NEXT:    0010: 82001200 BC010000 28000000 10000000  |........(.......|
 CHECK-NEXT:    0020: 10000000 01001800 00000000 00030000  |................|

llvm/test/tools/llvm-readobj/coff-resources.test

 ZERO-NEXT:        Major Version: 0
 ZERO-NEXT:        Minor Version: 0
 ZERO-NEXT:        Characteristics: 0
 ZERO-NEXT:        Data [
 ZERO-NEXT:          DataRVA: 0x0
 ZERO-NEXT:          DataSize: 42
 ZERO-NEXT:          Codepage: 0
 ZERO-NEXT:          Reserved: 0
+ZERO-NEXT:          Data (
+ZERO-NEXT:            0000: 00000500 48006500 6C006C00 6F000000  |....H.e.l.l.o...|
+ZERO-NEXT:            0010: 00000000 00000000 00000000 00000000  |................|
+ZERO-NEXT:            0020: 00000000 00000000 0000               |..........|
+ZERO-NEXT:          )
 ZERO-NEXT:        ]
 ZERO-NEXT:      ]
 ZERO-NEXT:    ]
 ZERO-NEXT:  ]
 
 TEST_RES:     Resources [
 TEST_RES-NEXT:  Total Number of Resources: 7
 TEST_RES-NEXT:  Base Table Address: 0x1C0  

 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 808
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:    Name: OKAY [
 TEST_RES-NEXT:      Table Offset: 0xC0
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 1033) [
 TEST_RES-NEXT:        Entry Offset: 0x160
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 808
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:  ]
 TEST_RES-NEXT:  Type: MENU (ID 4) [
 TEST_RES-NEXT:    Table Offset: 0x50
 TEST_RES-NEXT:    Number of String Entries: 1
 TEST_RES-NEXT:    Number of ID Entries: 1
 TEST_RES-NEXT:    Name: "EAT" [
 TEST_RES-NEXT:      Table Offset: 0xD8
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 3081) [
 TEST_RES-NEXT:        Entry Offset: 0x170
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 48
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:    Name: (ID 14432) [
 TEST_RES-NEXT:      Table Offset: 0xF0
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 2052) [
 TEST_RES-NEXT:        Entry Offset: 0x180
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 46
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:  ]
 TEST_RES-NEXT:  Type: DIALOG (ID 5) [
 TEST_RES-NEXT:    Table Offset: 0x70
 TEST_RES-NEXT:    Number of String Entries: 1
 TEST_RES-NEXT:    Number of ID Entries: 0
 TEST_RES-NEXT:    Name: TESTDIALOG [
 TEST_RES-NEXT:      Table Offset: 0x108
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 1033) [
 TEST_RES-NEXT:        Entry Offset: 0x190
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 108
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:  ]
 TEST_RES-NEXT:  Type: ACCELERATOR (ID 9) [
 TEST_RES-NEXT:    Table Offset: 0x88
 TEST_RES-NEXT:    Number of String Entries: 1
 TEST_RES-NEXT:    Number of ID Entries: 1
 TEST_RES-NEXT:    Name: MYACCELERATORS [
 TEST_RES-NEXT:      Table Offset: 0x120
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 1033) [
 TEST_RES-NEXT:        Entry Offset: 0x1A0
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 24
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:    Name: (ID 12) [
 TEST_RES-NEXT:      Table Offset: 0x138
 TEST_RES-NEXT:      Number of String Entries: 0
 TEST_RES-NEXT:      Number of ID Entries: 1
 TEST_RES-NEXT:      Language: (ID 1033) [
 TEST_RES-NEXT:        Entry Offset: 0x1B0
 TEST_RES-NEXT:        Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
 TEST_RES-NEXT:        Major Version: 0
 TEST_RES-NEXT:        Minor Version: 0
 TEST_RES-NEXT:        Characteristics: 0
 TEST_RES-NEXT:        Data [
 TEST_RES-NEXT:          DataRVA: 0x0
 TEST_RES-NEXT:          DataSize: 24
 TEST_RES-NEXT:          Codepage: 0
 TEST_RES-NEXT:          Reserved: 0
+TEST_RES-NEXT:          Data (
+TEST_RES:               )
 TEST_RES-NEXT:        ]
 TEST_RES-NEXT:      ]
 TEST_RES-NEXT:    ]
 TEST_RES-NEXT:  ]

llvm/tools/llvm-readobj/COFFDumper.cpp

   for (const SectionRef &S : Obj->sections()) {
     StringRef Name = unwrapOrError(Obj->getFileName(), S.getName());
     if (!Name.startswith(".rsrc"))
       continue;
 
     StringRef Ref = unwrapOrError(Obj->getFileName(), S.getContents());
 
     if ((Name == ".rsrc") || (Name == ".rsrc$01")) {
-      ResourceSectionRef RSF(Ref);
+      ResourceSectionRef RSF;
+      Error E = RSF.load(Obj, S);
+      if (E)
+        reportError(std::move(E), Obj->getFileName());
       auto &BaseTable = unwrapOrError(Obj->getFileName(), RSF.getBaseTable());
       W.printNumber("Total Number of Resources",
                     countTotalTableEntries(RSF, BaseTable, "Type"));
       W.printHex("Base Table Address",
                  Obj->getCOFFSection(S)->PointerToRawData);
       W.startLine() << "\n";
       printResourceDirectoryTable(RSF, BaseTable, "Type");
     }

       W.printNumber("Characteristics", Table.Characteristics);
       ListScope DataScope(W, "Data");
       auto &DataEntry =
           unwrapOrError(Obj->getFileName(), RSF.getEntryData(Entry));
       W.printHex("DataRVA", DataEntry.DataRVA);
       W.printNumber("DataSize", DataEntry.DataSize);
       W.printNumber("Codepage", DataEntry.Codepage);
       W.printNumber("Reserved", DataEntry.Reserved);
+      StringRef Contents =
+          unwrapOrError(Obj->getFileName(), RSF.getContents(DataEntry));
+      W.printBinaryBlock("Data", Contents);
     }
   }
 }
 
 void COFFDumper::printStackMap() const {
   object::SectionRef StackMapSection;
   for (auto Sec : Obj->sections()) {
     StringRef Name;