wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split MergeInputSection's ctor. NFC. 

llvm-svn: 270386
This commit is contained in:
Rui Ueyama 2016-05-23 00:40:24 +00:00
parent 88abd9b300
commit 518f1af04d
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lld/ELF/InputSection.cpp
View File

@ -468,32 +468,45 @@ static size_t findNull(ArrayRef<uint8_t> A, size_t EntSize) {
return StringRef::npos; return StringRef::npos;
} }
// Split SHF_STRINGS section. Such section is a sequence of
// null-terminated strings.
std::vector<SectionPiece> splitStrings(ArrayRef<uint8_t> Data, size_t EntSize) {
std::vector<SectionPiece> V;
size_t Off = 0;
while (!Data.empty()) {
size_t End = findNull(Data, EntSize);
if (End == StringRef::npos)
fatal("string is not null terminated");
size_t Size = End + EntSize;
V.emplace_back(Off, Data.slice(0, Size));
Data = Data.slice(Size);
Off += Size;
}
return V;
}
// Split non-SHF_STRINGS section. Such section is a sequence of
// fixed size records.
std::vector<SectionPiece>
splitNonStrings(ArrayRef<uint8_t> Data, size_t EntSize) {
std::vector<SectionPiece> V;
size_t Size = Data.size();
assert((Size % EntSize) == 0);
for (unsigned I = 0, N = Size; I != N; I += EntSize)
V.emplace_back(I, Data.slice(I, EntSize));
return V;
}
template <class ELFT> template <class ELFT>
MergeInputSection<ELFT>::MergeInputSection(elf::ObjectFile<ELFT> *F, MergeInputSection<ELFT>::MergeInputSection(elf::ObjectFile<ELFT> *F,
const Elf_Shdr *Header) const Elf_Shdr *Header)
: SplitInputSection<ELFT>(F, Header, InputSectionBase<ELFT>::Merge) { : SplitInputSection<ELFT>(F, Header, InputSectionBase<ELFT>::Merge) {
uintX_t EntSize = Header->sh_entsize;
ArrayRef<uint8_t> Data = this->getSectionData(); ArrayRef<uint8_t> Data = this->getSectionData();
uintX_t EntSize = this->Header->sh_entsize;
if (Header->sh_flags & SHF_STRINGS) { if (this->Header->sh_flags & SHF_STRINGS)
uintX_t Offset = 0; this->Pieces = splitStrings(Data, EntSize);
while (!Data.empty()) { else
size_t End = findNull(Data, EntSize); this->Pieces = splitNonStrings(Data, EntSize);
if (End == StringRef::npos)
fatal("string is not null terminated");
uintX_t Size = End + EntSize;
this->Pieces.emplace_back(Offset, Data.slice(0, Size));
Data = Data.slice(Size);
Offset += Size;
}
return;
}
// If this is not of type string, every entry has the same size.
size_t Size = Data.size();
assert((Size % EntSize) == 0);
for (unsigned I = 0, N = Size; I != N; I += EntSize)
this->Pieces.emplace_back(I, Data.slice(I, EntSize));
} }
template <class ELFT> template <class ELFT>