2020-04-22 04:37:57 +08:00
|
|
|
//===- SyntheticSections.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_SYNTHETIC_SECTIONS_H
|
|
|
|
#define LLD_MACHO_SYNTHETIC_SECTIONS_H
|
|
|
|
|
2020-04-30 06:42:19 +08:00
|
|
|
#include "ExportTrie.h"
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
#include "InputSection.h"
|
2020-05-02 07:29:06 +08:00
|
|
|
#include "OutputSection.h"
|
2020-04-22 04:37:57 +08:00
|
|
|
#include "Target.h"
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
|
2020-04-22 04:37:57 +08:00
|
|
|
#include "llvm/ADT/SetVector.h"
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
#include "llvm/Support/raw_ostream.h"
|
2020-04-22 04:37:57 +08:00
|
|
|
|
|
|
|
namespace lld {
|
|
|
|
namespace macho {
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
namespace section_names {
|
|
|
|
|
|
|
|
constexpr const char *pageZero = "__pagezero";
|
|
|
|
constexpr const char *header = "__mach_header";
|
|
|
|
constexpr const char *binding = "__binding";
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
constexpr const char *lazyBinding = "__lazy_binding";
|
2020-04-29 07:58:22 +08:00
|
|
|
constexpr const char *export_ = "__export";
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
constexpr const char *symbolTable = "__symbol_table";
|
|
|
|
constexpr const char *stringTable = "__string_table";
|
2020-05-02 07:29:06 +08:00
|
|
|
constexpr const char *got = "__got";
|
2020-04-28 03:50:59 +08:00
|
|
|
|
|
|
|
} // namespace section_names
|
|
|
|
|
2020-04-22 04:37:57 +08:00
|
|
|
class DylibSymbol;
|
2020-04-28 03:50:59 +08:00
|
|
|
class LoadCommand;
|
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
class SyntheticSection : public OutputSection {
|
|
|
|
public:
|
|
|
|
SyntheticSection(const char *segname, const char *name);
|
|
|
|
virtual ~SyntheticSection() = default;
|
2020-05-06 07:37:34 +08:00
|
|
|
|
|
|
|
static bool classof(const OutputSection *sec) {
|
|
|
|
return sec->kind() == SyntheticKind;
|
|
|
|
}
|
2020-05-02 07:29:06 +08:00
|
|
|
};
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
// The header of the Mach-O file, which must have a file offset of zero.
|
2020-05-02 07:29:06 +08:00
|
|
|
class MachHeaderSection : public SyntheticSection {
|
2020-04-28 03:50:59 +08:00
|
|
|
public:
|
|
|
|
MachHeaderSection();
|
|
|
|
void addLoadCommand(LoadCommand *);
|
|
|
|
bool isHidden() const override { return true; }
|
|
|
|
size_t getSize() const override;
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override;
|
2020-04-28 03:50:59 +08:00
|
|
|
|
|
|
|
private:
|
|
|
|
std::vector<LoadCommand *> loadCommands;
|
|
|
|
uint32_t sizeOfCmds = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
// A hidden section that exists solely for the purpose of creating the
|
|
|
|
// __PAGEZERO segment, which is used to catch null pointer dereferences.
|
2020-05-02 07:29:06 +08:00
|
|
|
class PageZeroSection : public SyntheticSection {
|
2020-04-28 03:50:59 +08:00
|
|
|
public:
|
|
|
|
PageZeroSection();
|
|
|
|
bool isHidden() const override { return true; }
|
|
|
|
size_t getSize() const override { return ImageBase; }
|
|
|
|
uint64_t getFileSize() const override { return 0; }
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override {}
|
2020-04-28 03:50:59 +08:00
|
|
|
};
|
2020-04-22 04:37:57 +08:00
|
|
|
|
|
|
|
// This section will be populated by dyld with addresses to non-lazily-loaded
|
|
|
|
// dylib symbols.
|
2020-05-02 07:29:06 +08:00
|
|
|
class GotSection : public SyntheticSection {
|
2020-04-22 04:37:57 +08:00
|
|
|
public:
|
|
|
|
GotSection();
|
|
|
|
|
|
|
|
const llvm::SetVector<const DylibSymbol *> &getEntries() const {
|
|
|
|
return entries;
|
|
|
|
}
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
bool isNeeded() const override { return !entries.empty(); }
|
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
size_t getSize() const override { return entries.size() * WordSize; }
|
|
|
|
|
|
|
|
void writeTo(uint8_t *buf) const override {
|
2020-04-22 04:37:57 +08:00
|
|
|
// Nothing to write, GOT contains all zeros at link time; it's populated at
|
|
|
|
// runtime by dyld.
|
|
|
|
}
|
|
|
|
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
void addEntry(DylibSymbol &sym);
|
|
|
|
|
2020-04-22 04:37:57 +08:00
|
|
|
private:
|
|
|
|
llvm::SetVector<const DylibSymbol *> entries;
|
|
|
|
};
|
|
|
|
|
2020-04-28 03:50:59 +08:00
|
|
|
// Stores bind opcodes for telling dyld which symbols to load non-lazily.
|
2020-05-02 07:29:06 +08:00
|
|
|
class BindingSection : public SyntheticSection {
|
2020-04-28 03:50:59 +08:00
|
|
|
public:
|
|
|
|
BindingSection();
|
|
|
|
void finalizeContents();
|
|
|
|
size_t getSize() const override { return contents.size(); }
|
|
|
|
// Like other sections in __LINKEDIT, the binding section is special: its
|
|
|
|
// offsets are recorded in the LC_DYLD_INFO_ONLY load command, instead of in
|
|
|
|
// section headers.
|
|
|
|
bool isHidden() const override { return true; }
|
|
|
|
bool isNeeded() const override;
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override;
|
2020-04-28 03:50:59 +08:00
|
|
|
|
|
|
|
SmallVector<char, 128> contents;
|
|
|
|
};
|
|
|
|
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
// The following sections implement lazy symbol binding -- very similar to the
|
|
|
|
// PLT mechanism in ELF.
|
|
|
|
//
|
|
|
|
// ELF's .plt section is broken up into two sections in Mach-O: StubsSection and
|
|
|
|
// StubHelperSection. Calls to functions in dylibs will end up calling into
|
|
|
|
// StubsSection, which contains indirect jumps to addresses stored in the
|
|
|
|
// LazyPointerSection (the counterpart to ELF's .plt.got).
|
|
|
|
//
|
|
|
|
// Initially, the LazyPointerSection contains addresses that point into one of
|
|
|
|
// the entry points in the middle of the StubHelperSection. The code in
|
|
|
|
// StubHelperSection will push on the stack an offset into the
|
|
|
|
// LazyBindingSection. The push is followed by a jump to the beginning of the
|
|
|
|
// StubHelperSection (similar to PLT0), which then calls into dyld_stub_binder.
|
|
|
|
// dyld_stub_binder is a non-lazily-bound symbol, so this call looks it up in
|
|
|
|
// the GOT.
|
|
|
|
//
|
|
|
|
// The stub binder will look up the bind opcodes in the LazyBindingSection at
|
|
|
|
// the given offset. The bind opcodes will tell the binder to update the address
|
|
|
|
// in the LazyPointerSection to point to the symbol, so that subsequent calls
|
|
|
|
// don't have to redo the symbol resolution. The binder will then jump to the
|
|
|
|
// resolved symbol.
|
|
|
|
|
|
|
|
class StubsSection : public SyntheticSection {
|
|
|
|
public:
|
|
|
|
StubsSection();
|
|
|
|
size_t getSize() const override;
|
|
|
|
bool isNeeded() const override { return !entries.empty(); }
|
|
|
|
void writeTo(uint8_t *buf) const override;
|
|
|
|
|
|
|
|
const llvm::SetVector<DylibSymbol *> &getEntries() const { return entries; }
|
|
|
|
|
|
|
|
void addEntry(DylibSymbol &sym);
|
|
|
|
|
|
|
|
private:
|
|
|
|
llvm::SetVector<DylibSymbol *> entries;
|
|
|
|
};
|
|
|
|
|
|
|
|
class StubHelperSection : public SyntheticSection {
|
|
|
|
public:
|
|
|
|
StubHelperSection();
|
|
|
|
size_t getSize() const override;
|
|
|
|
bool isNeeded() const override;
|
|
|
|
void writeTo(uint8_t *buf) const override;
|
|
|
|
|
|
|
|
void setup();
|
|
|
|
|
|
|
|
DylibSymbol *stubBinder = nullptr;
|
|
|
|
};
|
|
|
|
|
|
|
|
// This section contains space for just a single word, and will be used by dyld
|
|
|
|
// to cache an address to the image loader it uses. Note that unlike the other
|
|
|
|
// synthetic sections, which are OutputSections, the ImageLoaderCacheSection is
|
|
|
|
// an InputSection that gets merged into the __data OutputSection.
|
|
|
|
class ImageLoaderCacheSection : public InputSection {
|
|
|
|
public:
|
|
|
|
ImageLoaderCacheSection();
|
|
|
|
size_t getSize() const override { return WordSize; }
|
|
|
|
};
|
|
|
|
|
|
|
|
class LazyPointerSection : public SyntheticSection {
|
|
|
|
public:
|
|
|
|
LazyPointerSection();
|
|
|
|
size_t getSize() const override;
|
|
|
|
bool isNeeded() const override;
|
|
|
|
void writeTo(uint8_t *buf) const override;
|
|
|
|
};
|
|
|
|
|
|
|
|
class LazyBindingSection : public SyntheticSection {
|
|
|
|
public:
|
|
|
|
LazyBindingSection();
|
|
|
|
void finalizeContents();
|
|
|
|
size_t getSize() const override { return contents.size(); }
|
|
|
|
uint32_t encode(const DylibSymbol &);
|
|
|
|
// Like other sections in __LINKEDIT, the lazy binding section is special: its
|
|
|
|
// offsets are recorded in the LC_DYLD_INFO_ONLY load command, instead of in
|
|
|
|
// section headers.
|
|
|
|
bool isHidden() const override { return true; }
|
|
|
|
bool isNeeded() const override;
|
|
|
|
void writeTo(uint8_t *buf) const override;
|
|
|
|
|
|
|
|
private:
|
|
|
|
SmallVector<char, 128> contents;
|
|
|
|
llvm::raw_svector_ostream os{contents};
|
|
|
|
};
|
|
|
|
|
2020-04-29 07:58:22 +08:00
|
|
|
// Stores a trie that describes the set of exported symbols.
|
2020-05-02 07:29:06 +08:00
|
|
|
class ExportSection : public SyntheticSection {
|
2020-04-29 07:58:22 +08:00
|
|
|
public:
|
|
|
|
ExportSection();
|
|
|
|
void finalizeContents();
|
2020-04-30 06:42:19 +08:00
|
|
|
size_t getSize() const override { return size; }
|
2020-04-29 07:58:22 +08:00
|
|
|
// Like other sections in __LINKEDIT, the export section is special: its
|
|
|
|
// offsets are recorded in the LC_DYLD_INFO_ONLY load command, instead of in
|
|
|
|
// section headers.
|
|
|
|
bool isHidden() const override { return true; }
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override;
|
2020-04-29 07:58:22 +08:00
|
|
|
|
2020-04-30 06:42:19 +08:00
|
|
|
private:
|
|
|
|
TrieBuilder trieBuilder;
|
|
|
|
size_t size = 0;
|
2020-04-29 07:58:22 +08:00
|
|
|
};
|
|
|
|
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
// Stores the strings referenced by the symbol table.
|
2020-05-02 07:29:06 +08:00
|
|
|
class StringTableSection : public SyntheticSection {
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
public:
|
|
|
|
StringTableSection();
|
|
|
|
// Returns the start offset of the added string.
|
|
|
|
uint32_t addString(StringRef);
|
|
|
|
size_t getSize() const override { return size; }
|
|
|
|
// Like other sections in __LINKEDIT, the string table section is special: its
|
|
|
|
// offsets are recorded in the LC_SYMTAB load command, instead of in section
|
|
|
|
// headers.
|
|
|
|
bool isHidden() const override { return true; }
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override;
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
|
|
|
|
private:
|
|
|
|
// An n_strx value of 0 always indicates the empty string, so we must locate
|
|
|
|
// our non-empty string values at positive offsets in the string table.
|
|
|
|
// Therefore we insert a dummy value at position zero.
|
|
|
|
std::vector<StringRef> strings{"\0"};
|
|
|
|
size_t size = 1;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct SymtabEntry {
|
|
|
|
Symbol *sym;
|
|
|
|
size_t strx;
|
|
|
|
};
|
|
|
|
|
2020-05-02 07:29:06 +08:00
|
|
|
class SymtabSection : public SyntheticSection {
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
public:
|
|
|
|
SymtabSection(StringTableSection &);
|
|
|
|
void finalizeContents();
|
|
|
|
size_t getNumSymbols() const { return symbols.size(); }
|
|
|
|
size_t getSize() const override;
|
|
|
|
// Like other sections in __LINKEDIT, the symtab section is special: its
|
|
|
|
// offsets are recorded in the LC_SYMTAB load command, instead of in section
|
|
|
|
// headers.
|
|
|
|
bool isHidden() const override { return true; }
|
2020-05-02 07:29:06 +08:00
|
|
|
void writeTo(uint8_t *buf) const override;
|
[lld-macho][reland] Add basic symbol table output
This diff implements basic support for writing a symbol table.
Attributes are loosely supported for extern symbols and not at all for
other types.
Initial version by Kellie Medlin <kelliem@fb.com>
Originally committed in a3d95a50ee33 and reverted in fbae153ca583 due to
UBSAN erroring over unaligned writes. That has been fixed in the
current diff with the following changes:
```
diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp
--- a/lld/MachO/SyntheticSections.cpp
+++ b/lld/MachO/SyntheticSections.cpp
@@ -133,6 +133,9 @@ SymtabSection::SymtabSection(StringTableSection &stringTableSection)
: stringTableSection(stringTableSection) {
segname = segment_names::linkEdit;
name = section_names::symbolTable;
+ // TODO: When we introduce the SyntheticSections superclass, we should make
+ // all synthetic sections aligned to WordSize by default.
+ align = WordSize;
}
size_t SymtabSection::getSize() const {
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -371,6 +371,7 @@ void Writer::assignAddresses(OutputSegment *seg) {
ArrayRef<InputSection *> sections = p.second;
for (InputSection *isec : sections) {
addr = alignTo(addr, isec->align);
+ // We must align the file offsets too to avoid misaligned writes of
+ // structs.
+ fileOff = alignTo(fileOff, isec->align);
isec->addr = addr;
addr += isec->getSize();
fileOff += isec->getFileSize();
@@ -396,6 +397,7 @@ void Writer::writeSections() {
uint64_t fileOff = seg->fileOff;
for (auto § : seg->getSections()) {
for (InputSection *isec : sect.second) {
+ fileOff = alignTo(fileOff, isec->align);
isec->writeTo(buf + fileOff);
fileOff += isec->getFileSize();
}
```
I don't think it's easy to write a test for alignment (that doesn't
involve brittly hard-coding file offsets), so there isn't one... but
UBSAN builds pass now.
Differential Revision: https://reviews.llvm.org/D79050
2020-04-29 07:58:19 +08:00
|
|
|
|
|
|
|
private:
|
|
|
|
StringTableSection &stringTableSection;
|
|
|
|
std::vector<SymtabEntry> symbols;
|
|
|
|
};
|
|
|
|
|
2020-04-22 04:37:57 +08:00
|
|
|
struct InStruct {
|
2020-04-28 03:50:59 +08:00
|
|
|
GotSection *got = nullptr;
|
[lld-macho] Support calls to functions in dylibs
Summary:
This diff implements lazy symbol binding -- very similar to the PLT
mechanism in ELF.
ELF's .plt section is broken up into two sections in Mach-O:
StubsSection and StubHelperSection. Calls to functions in dylibs will
end up calling into StubsSection, which contains indirect jumps to
addresses stored in the LazyPointerSection (the counterpart to ELF's
.plt.got).
Initially, the LazyPointerSection contains addresses that point into one
of the entry points in the middle of the StubHelperSection. The code in
StubHelperSection will push on the stack an offset into the
LazyBindingSection. The push is followed by a jump to the beginning of
the StubHelperSection (similar to PLT0), which then calls into
dyld_stub_binder. dyld_stub_binder is a non-lazily bound symbol, so this
call looks it up in the GOT.
The stub binder will look up the bind opcodes in the LazyBindingSection
at the given offset. The bind opcodes will tell the binder to update the
address in the LazyPointerSection to point to the symbol, so that
subsequent calls don't have to redo the symbol resolution. The binder
will then jump to the resolved symbol.
Depends on D78269.
Reviewers: ruiu, pcc, MaskRay, smeenai, alexshap, gkm, Ktwu, christylee
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D78270
2020-05-06 08:38:10 +08:00
|
|
|
LazyPointerSection *lazyPointers = nullptr;
|
|
|
|
StubsSection *stubs = nullptr;
|
|
|
|
StubHelperSection *stubHelper = nullptr;
|
|
|
|
ImageLoaderCacheSection *imageLoaderCache = nullptr;
|
2020-04-22 04:37:57 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
extern InStruct in;
|
|
|
|
|
|
|
|
} // namespace macho
|
|
|
|
} // namespace lld
|
|
|
|
|
|
|
|
#endif
|