diff options
| -rw-r--r-- | llvm/test/Object/Inputs/COFF/long-section-name.yaml | 11 | ||||
| -rw-r--r-- | llvm/test/Object/obj2yaml-coff-long-section-name.test | 3 | ||||
| -rw-r--r-- | llvm/tools/obj2yaml/coff2yaml.cpp | 10 |
3 files changed, 19 insertions, 5 deletions
diff --git a/llvm/test/Object/Inputs/COFF/long-section-name.yaml b/llvm/test/Object/Inputs/COFF/long-section-name.yaml new file mode 100644 index 00000000000..a86f9019cd5 --- /dev/null +++ b/llvm/test/Object/Inputs/COFF/long-section-name.yaml @@ -0,0 +1,11 @@ +--- +header: + Machine: IMAGE_FILE_MACHINE_I386 + Characteristics: [ IMAGE_FILE_RELOCS_STRIPPED, IMAGE_FILE_LINE_NUMS_STRIPPED, IMAGE_FILE_LOCAL_SYMS_STRIPPED, IMAGE_FILE_32BIT_MACHINE ] +sections: + - Name: .long_section_name + Characteristics: [ IMAGE_SCN_CNT_INITIALIZED_DATA, IMAGE_SCN_MEM_READ ] + Alignment: 1 + SectionData: '' +symbols: +... diff --git a/llvm/test/Object/obj2yaml-coff-long-section-name.test b/llvm/test/Object/obj2yaml-coff-long-section-name.test new file mode 100644 index 00000000000..5457aef28c5 --- /dev/null +++ b/llvm/test/Object/obj2yaml-coff-long-section-name.test @@ -0,0 +1,3 @@ +RUN: yaml2obj %p/Inputs/COFF/long-section-name.yaml | obj2yaml | FileCheck %s --check-prefix COFF-I386 + +COFF-I386: Name: .long_section_name diff --git a/llvm/tools/obj2yaml/coff2yaml.cpp b/llvm/tools/obj2yaml/coff2yaml.cpp index e22aff76071..05d30f3fb62 100644 --- a/llvm/tools/obj2yaml/coff2yaml.cpp +++ b/llvm/tools/obj2yaml/coff2yaml.cpp @@ -47,13 +47,13 @@ void COFFDumper::dumpSections(unsigned NumSections) { for (const auto &Section : Obj.sections()) { const object::coff_section *Sect = Obj.getCOFFSection(Section); COFFYAML::Section Sec; - Sec.Name = Sect->Name; // FIXME: check the null termination! - uint32_t Characteristics = Sect->Characteristics; - Sec.Header.Characteristics = Characteristics; - Sec.Alignment = 1 << (((Characteristics >> 20) & 0xf) - 1); + Section.getName(Sec.Name); + Sec.Header.Characteristics = Sect->Characteristics; + Sec.Alignment = Section.getAlignment(); ArrayRef<uint8_t> sectionData; - Obj.getSectionContents(Sect, sectionData); + if (!Section.isBSS()) + Obj.getSectionContents(Sect, sectionData); Sec.SectionData = yaml::BinaryRef(sectionData); std::vector<COFFYAML::Relocation> Relocations; |
