2020-04-03 02:54:05 +08:00
|
|
|
//===- OutputSegment.cpp --------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "OutputSegment.h"
|
2020-04-28 03:50:59 +08:00
|
|
|
#include "InputSection.h"
|
2020-05-02 07:29:06 +08:00
|
|
|
#include "MergedOutputSection.h"
|
|
|
|
#include "SyntheticSections.h"
|
2020-04-28 03:50:59 +08:00
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
#include "lld/Common/ErrorHandler.h"
|
2020-04-03 02:54:05 +08:00
|
|
|
#include "lld/Common/Memory.h"
|
2020-04-28 03:50:59 +08:00
|
|
|
#include "llvm/BinaryFormat/MachO.h"
|
2020-04-03 02:54:05 +08:00
|
|
|
|
|
|
|
using namespace llvm;
|
2020-04-28 03:50:59 +08:00
|
|
|
using namespace llvm::MachO;
|
2020-04-03 02:54:05 +08:00
|
|
|
using namespace lld;
|
|
|
|
using namespace lld::macho;
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
static uint32_t initProt(StringRef name) {
|
2021-03-30 02:08:12 +08:00
|
|
|
auto it = find_if(
|
|
|
|
config->segmentProtections,
|
|
|
|
[&](const SegmentProtection &segprot) { return segprot.name == name; });
|
|
|
|
if (it != config->segmentProtections.end())
|
|
|
|
return it->initProt;
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
if (name == segment_names::text)
|
|
|
|
return VM_PROT_READ | VM_PROT_EXECUTE;
|
|
|
|
if (name == segment_names::pageZero)
|
|
|
|
return 0;
|
|
|
|
if (name == segment_names::linkEdit)
|
|
|
|
return VM_PROT_READ;
|
|
|
|
return VM_PROT_READ | VM_PROT_WRITE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static uint32_t maxProt(StringRef name) {
|
2021-04-22 03:43:38 +08:00
|
|
|
assert(config->arch() != AK_i386 &&
|
2020-10-15 03:46:49 +08:00
|
|
|
"TODO: i386 has different maxProt requirements");
|
|
|
|
return initProt(name);
|
2020-04-28 03:50:59 +08:00
|
|
|
}
|
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
size_t OutputSegment::numNonHiddenSections() const {
|
|
|
|
size_t count = 0;
|
2021-03-17 12:34:28 +08:00
|
|
|
for (const OutputSection *osec : sections)
|
[lld-macho] Refactor segment/section creation, sorting, and merging
Summary:
There were a few issues with the previous setup:
1. The section sorting comparator used a declarative map of section names to
determine the correct order, but it turns out we need to match on more than
just names -- in particular, an upcoming diff will sort based on whether the
S_ZERO_FILL flag is set. This diff changes the sorter to a more imperative but
flexible form.
2. We were sorting OutputSections stored in a MapVector, which left the
MapVector in an inconsistent state -- the wrong keys map to the wrong values!
In practice, we weren't doing key lookups (only container iteration) after the
sort, so this was fine, but it was still a dubious state of affairs. This diff
copies the OutputSections to a vector before sorting them.
3. We were adding unneeded OutputSections to OutputSegments and then filtering
them out later, which meant that we had to remember whether an OutputSegment
was in a pre- or post-filtered state. This diff only adds the sections to the
segments if they are needed.
In addition to those major changes, two minor ones worth noting:
1. I renamed all OutputSection variable names to `osec`, to parallel `isec`.
Previously we were using some inconsistent combination of `osec`, `os`, and
`section`.
2. I added a check (and a test) for InputSections with names that clashed with
those of our synthetic OutputSections.
Reviewers: #lld-macho
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D81887
2020-06-15 15:03:24 +08:00
|
|
|
count += (!osec->isHidden() ? 1 : 0);
|
2020-05-02 07:29:06 +08:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
[lld-macho] Refactor segment/section creation, sorting, and merging
Summary:
There were a few issues with the previous setup:
1. The section sorting comparator used a declarative map of section names to
determine the correct order, but it turns out we need to match on more than
just names -- in particular, an upcoming diff will sort based on whether the
S_ZERO_FILL flag is set. This diff changes the sorter to a more imperative but
flexible form.
2. We were sorting OutputSections stored in a MapVector, which left the
MapVector in an inconsistent state -- the wrong keys map to the wrong values!
In practice, we weren't doing key lookups (only container iteration) after the
sort, so this was fine, but it was still a dubious state of affairs. This diff
copies the OutputSections to a vector before sorting them.
3. We were adding unneeded OutputSections to OutputSegments and then filtering
them out later, which meant that we had to remember whether an OutputSegment
was in a pre- or post-filtered state. This diff only adds the sections to the
segments if they are needed.
In addition to those major changes, two minor ones worth noting:
1. I renamed all OutputSection variable names to `osec`, to parallel `isec`.
Previously we were using some inconsistent combination of `osec`, `os`, and
`section`.
2. I added a check (and a test) for InputSections with names that clashed with
those of our synthetic OutputSections.
Reviewers: #lld-macho
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D81887
2020-06-15 15:03:24 +08:00
|
|
|
void OutputSegment::addOutputSection(OutputSection *osec) {
|
|
|
|
osec->parent = this;
|
|
|
|
sections.push_back(osec);
|
2020-04-28 03:50:59 +08:00
|
|
|
}
|
|
|
|
|
2021-01-10 00:58:19 +08:00
|
|
|
static DenseMap<StringRef, OutputSegment *> nameToOutputSegment;
|
2020-04-03 02:54:05 +08:00
|
|
|
std::vector<OutputSegment *> macho::outputSegments;
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
OutputSegment *macho::getOrCreateOutputSegment(StringRef name) {
|
|
|
|
OutputSegment *&segRef = nameToOutputSegment[name];
|
2020-09-24 11:09:49 +08:00
|
|
|
if (segRef)
|
2020-04-28 03:50:59 +08:00
|
|
|
return segRef;
|
|
|
|
|
|
|
|
segRef = make<OutputSegment>();
|
|
|
|
segRef->name = name;
|
|
|
|
segRef->maxProt = maxProt(name);
|
|
|
|
segRef->initProt = initProt(name);
|
|
|
|
|
|
|
|
outputSegments.push_back(segRef);
|
|
|
|
return segRef;
|
2020-04-03 02:54:05 +08:00
|
|
|
}
|