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

Refactor LinkerScript::assignAddresses. NFC. 

llvm-svn: 266666
This commit is contained in:
Rui Ueyama 2016-04-18 21:00:40 +00:00
parent 3b2fd0a205
commit 7c18c28c97
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lld/ELF/LinkerScript.cpp
View File

@ -90,30 +90,33 @@ template <class ELFT> bool LinkerScript::shouldKeep(InputSectionBase<ELFT> *S) {
return R && R->Keep;
}
// This method finalizes the Locations list. Adds neccesary locations for
// orphan sections, what prepares it for futher use without
// changes in LinkerScript::assignAddresses().
template <class ELFT>
void LinkerScript::fixupLocations(std::vector<OutputSectionBase<ELFT> *> &S) {
static OutputSectionBase<ELFT> *
findSection(std::vector<OutputSectionBase<ELFT> *> &V, StringRef Name) {
for (OutputSectionBase<ELFT> *Sec : V)
if (Sec->getName() == Name)
return Sec;
return nullptr;
}
template <class ELFT>
void LinkerScript::assignAddresses(
std::vector<OutputSectionBase<ELFT> *> &Sections) {
typedef typename ELFT::uint uintX_t;
// Orphan sections are sections present in the input files which
// are not explicitly placed into the output file by the linker
// script. We place orphan sections at end of file. Other linkers places
// them using some heuristics as described in
// are not explicitly placed into the output file by the linker script.
// We place orphan sections at end of file.
// Other linkers places them using some heuristics as described in
// https://sourceware.org/binutils/docs/ld/Orphan-Sections.html#Orphan-Sections.
for (OutputSectionBase<ELFT> *Sec : S) {
for (OutputSectionBase<ELFT> *Sec : Sections) {
StringRef Name = Sec->getName();
auto I = std::find(SectionOrder.begin(), SectionOrder.end(), Name);
if (I == SectionOrder.end())
Locations.push_back({Command::Section, {}, {Name}});
}
}
template <class ELFT>
void LinkerScript::assignAddresses(std::vector<OutputSectionBase<ELFT> *> &S) {
typedef typename ELFT::uint uintX_t;
Script->fixupLocations(S);
// Assign addresses as instructed by linker script SECTIONS sub-commands.
uintX_t ThreadBssOffset = 0;
uintX_t VA =
Out<ELFT>::ElfHeader->getSize() + Out<ELFT>::ProgramHeaders->getSize();
@ -124,25 +127,20 @@ void LinkerScript::assignAddresses(std::vector<OutputSectionBase<ELFT> *> &S) {
continue;
}
auto I =
std::find_if(S.begin(), S.end(), [&](OutputSectionBase<ELFT> *Sec) {
return Sec->getName() == Node.SectionName;
});
if (I == S.end())
OutputSectionBase<ELFT> *Sec = findSection(Sections, Node.SectionName);
if (!Sec)
continue;
OutputSectionBase<ELFT> *Sec = *I;
uintX_t Align = Sec->getAlign();
if ((Sec->getFlags() & SHF_TLS) && Sec->getType() == SHT_NOBITS) {
uintX_t TVA = VA + ThreadBssOffset;
TVA = alignTo(TVA, Align);
TVA = alignTo(TVA, Sec->getAlign());
Sec->setVA(TVA);
ThreadBssOffset = TVA - VA + Sec->getSize();
continue;
}
if (Sec->getFlags() & SHF_ALLOC) {
VA = alignTo(VA, Align);
VA = alignTo(VA, Sec->getAlign());
Sec->setVA(VA);
VA += Sec->getSize();
continue;

2
lld/ELF/LinkerScript.h
View File

@ -72,8 +72,6 @@ public:
bool DoLayout = false;
private:
template <class ELFT>
void fixupLocations(std::vector<OutputSectionBase<ELFT> *> &);
uint64_t evaluate(std::vector<StringRef> &Tokens, uint64_t LocCounter);
template <class ELFT> SectionRule *find(InputSectionBase<ELFT> *S);