RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-04 09:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

obj2yaml, COFF: Handle long section names

Browse Source 
Long section names are represented as a slash followed by a numeric
ASCII string.  This number is an offset into a string table.

Print the appropriate entry in the string table instead of the less
enlightening /4.

N.B.  yaml2obj already does the right thing, this test exercises both
sides of the (de-)serialization.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219458 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2014-10-10 00:17:57 +00:00
parent 0ffdb31af0
commit 54a3b749e1
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/Object/Inputs/COFF/long-section-name.yaml Normal file
View File

@ -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:
...

3
test/Object/obj2yaml-coff-long-section-name.test Normal file
View File

@ -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

10
tools/obj2yaml/coff2yaml.cpp
View File

@ -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;