2020-05-02 07:29:06 +08:00
|
|
|
//===- OutputSection.h ------------------------------------------*- C++ -*-===//
|
|
|
|
//
|
|
|
|
// 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
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#ifndef LLD_MACHO_MERGED_OUTPUT_SECTION_H
|
|
|
|
#define LLD_MACHO_MERGED_OUTPUT_SECTION_H
|
|
|
|
|
|
|
|
#include "InputSection.h"
|
|
|
|
#include "OutputSection.h"
|
|
|
|
#include "lld/Common/LLVM.h"
|
[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
|
|
|
#include "llvm/ADT/MapVector.h"
|
2020-05-02 07:29:06 +08:00
|
|
|
|
|
|
|
namespace lld {
|
|
|
|
namespace macho {
|
|
|
|
|
|
|
|
// Linking multiple files will inevitably mean resolving sections in different
|
|
|
|
// files that are labeled with the same segment and section name. This class
|
|
|
|
// contains all such sections and writes the data from each section sequentially
|
|
|
|
// in the final binary.
|
|
|
|
class MergedOutputSection : public OutputSection {
|
|
|
|
public:
|
2020-05-06 07:37:34 +08:00
|
|
|
MergedOutputSection(StringRef name) : OutputSection(MergedKind, name) {}
|
2020-05-02 07:29:06 +08:00
|
|
|
|
|
|
|
const InputSection *firstSection() const { return inputs.front(); }
|
|
|
|
const InputSection *lastSection() const { return inputs.back(); }
|
|
|
|
|
|
|
|
// These accessors will only be valid after finalizing the section
|
2020-06-17 08:27:28 +08:00
|
|
|
uint64_t getSize() const override { return size; }
|
2020-05-02 07:29:06 +08:00
|
|
|
uint64_t getFileSize() const override { return fileSize; }
|
|
|
|
|
[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 mergeInput(InputSection *input);
|
2020-05-02 07:29:06 +08:00
|
|
|
void finalize() override;
|
|
|
|
|
|
|
|
void writeTo(uint8_t *buf) const override;
|
|
|
|
|
|
|
|
std::vector<InputSection *> inputs;
|
|
|
|
|
2020-05-06 07:37:34 +08:00
|
|
|
static bool classof(const OutputSection *sec) {
|
|
|
|
return sec->kind() == MergedKind;
|
|
|
|
}
|
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
private:
|
|
|
|
void mergeFlags(uint32_t inputFlags);
|
|
|
|
|
|
|
|
size_t size = 0;
|
|
|
|
uint64_t fileSize = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace macho
|
|
|
|
} // namespace lld
|
|
|
|
|
|
|
|
#endif
|