d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lld: Remove MemRegionOffset. NFC.

Browse Source 
We can just use a member variable in MemoryRegion.

Obtained from:	LLVM r323399 by Rafael Espindola
This commit is contained in:
Ed Maste 2018-01-29 13:50:28 +00:00
parent 70bad66509
commit 6fcb8605ef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=328544
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/llvm/tools/lld/ELF/LinkerScript.cpp
View File

@ -590,7 +590,7 @@ void LinkerScript::output(InputSection *S) {
// If there is a memory region associated with this input section, then
// place the section in that region and update the region index.
if (Ctx->MemRegion) {
uint64_t &CurOffset = Ctx->MemRegionOffset[Ctx->MemRegion];
uint64_t &CurOffset = Ctx->MemRegion->CurPos;
CurOffset += Pos - Before;
uint64_t CurSize = CurOffset - Ctx->MemRegion->Origin;
if (CurSize > Ctx->MemRegion->Length) {
@ -652,7 +652,7 @@ void LinkerScript::assignOffsets(OutputSection *Sec) {
Ctx->MemRegion = Sec->MemRegion;
if (Ctx->MemRegion)
Dot = Ctx->MemRegionOffset[Ctx->MemRegion];
Dot = Ctx->MemRegion->CurPos;
switchTo(Sec);
@ -693,7 +693,7 @@ void LinkerScript::assignOffsets(OutputSection *Sec) {
Cmd->Offset = Dot - Ctx->OutSec->Addr;
Dot += Cmd->Size;
if (Ctx->MemRegion)
Ctx->MemRegionOffset[Ctx->MemRegion] += Cmd->Size;
Ctx->MemRegion->CurPos += Cmd->Size;
Ctx->OutSec->Size = Dot - Ctx->OutSec->Addr;
continue;
}
@ -888,8 +888,8 @@ void LinkerScript::allocateHeaders(std::vector<PhdrEntry *> &Phdrs) {
LinkerScript::AddressState::AddressState() {
for (auto &MRI : Script->MemoryRegions) {
const MemoryRegion *MR = MRI.second;
MemRegionOffset[MR] = MR->Origin;
MemoryRegion *MR = MRI.second;
MR->CurPos = MR->Origin;
}
}

7
contrib/llvm/tools/lld/ELF/LinkerScript.h
View File

@ -118,11 +118,17 @@ enum class ConstraintKind { NoConstraint, ReadOnly, ReadWrite };
// target memory. Instances of the struct are created by parsing the
// MEMORY command.
struct MemoryRegion {
MemoryRegion(StringRef Name, uint64_t Origin, uint64_t Length, uint32_t Flags,
uint32_t NegFlags)
: Name(Name), Origin(Origin), Length(Length), Flags(Flags),
NegFlags(NegFlags) {}
std::string Name;
uint64_t Origin;
uint64_t Length;
uint32_t Flags;
uint32_t NegFlags;
uint64_t CurPos = 0;
};
// This struct represents one section match pattern in SECTIONS() command.
@ -200,7 +206,6 @@ class LinkerScript final {
uint64_t ThreadBssOffset = 0;
OutputSection *OutSec = nullptr;
MemoryRegion *MemRegion = nullptr;
llvm::DenseMap<const MemoryRegion *, uint64_t> MemRegionOffset;
std::function<uint64_t()> LMAOffset;
};

4
contrib/llvm/tools/lld/ELF/ScriptParser.cpp
View File

@ -1293,8 +1293,8 @@ void ScriptParser::readMemory() {
// Add the memory region to the region map.
if (Script->MemoryRegions.count(Name))
setError("region '" + Name + "' already defined");
MemoryRegion *MR = make<MemoryRegion>();
*MR = {Name, Origin, Length, Flags, NegFlags};
MemoryRegion *MR =
make<MemoryRegion>(Name, Origin, Length, Flags, NegFlags);
Script->MemoryRegions[Name] = MR;
}
}