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

[ELF] - Refactoring of LMA offset handling code. NFC. 

Thanks to Rui Ueyama for suggestion.

llvm-svn: 295943
This commit is contained in:
George Rimar 2017-02-23 07:57:55 +00:00
parent b7f39b08f4
commit 2146787609
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/LinkerScript.cpp
View File

@ -463,9 +463,8 @@ void LinkerScript<ELFT>::switchTo(OutputSectionBase *Sec) {
// will set the LMA such that the difference between VMA and LMA for the
// section is the same as the preceding output section in the same region
// https://sourceware.org/binutils/docs-2.20/ld/Output-Section-LMA.html
Expr LMAExpr = CurLMA.first;
if (LMAExpr)
CurOutSec->setLMAOffset(LMAExpr(CurLMA.second) - CurLMA.second);
if (LMAOffset)
CurOutSec->setLMAOffset(LMAOffset());
}
template <class ELFT> void LinkerScript<ELFT>::process(BaseCommand &Base) {
@ -565,8 +564,10 @@ MemoryRegion *LinkerScript<ELFT>::findMemoryRegion(OutputSectionCommand *Cmd,
// for a single sections command (e.g. ".text { *(.text); }").
template <class ELFT>
void LinkerScript<ELFT>::assignOffsets(OutputSectionCommand *Cmd) {
if (Cmd->LMAExpr)
CurLMA = {Cmd->LMAExpr, Dot};
if (Cmd->LMAExpr) {
uintX_t D = Dot;
LMAOffset = [=] { return Cmd->LMAExpr(D) - D; };
}
OutputSectionBase *Sec = findSection<ELFT>(Cmd->Name, *OutputSections);
if (!Sec)
return;

2
lld/ELF/LinkerScript.h
View File

@ -298,7 +298,7 @@ private:
OutputSectionBase *Sec);
uintX_t Dot;
std::pair<Expr, uintX_t> CurLMA;
std::function<uint64_t()> LMAOffset;
OutputSectionBase *CurOutSec = nullptr;
MemoryRegion *CurMemRegion = nullptr;
uintX_t ThreadBssOffset = 0;