mirror of
https://github.com/llvm/llvm-project.git
synced 2025-04-18 19:06:44 +00:00
[LLD][COFF] Add support for ARM64EC entry thunks. (#88132)
For x86_64 callable functions, ARM64EC requires an entry thunk generated by the compiler. The linker interprets .hybmp sections to associate function chunks with their entry points and writes an offset to thunks preceding function section contents. Additionally, ICF needs to be aware of entry thunks to not consider chunks to be equal when they have different entry thunks, and GC needs to mark entry thunks together with function chunks. I used a new SectionChunkEC class instead of storing entry thunks in SectionChunk, following the guideline to keep SectionChunk as compact as possible. This way, there is no memory usage increase on non-EC targets.
This commit is contained in:
Jacek Caban
GitHub
parent
aabf6df644
commit
fed8e38c19
@ -31,8 +31,8 @@ using llvm::support::ulittle32_t;
|
||||
|
||||
namespace lld::coff {
|
||||
|
||||
SectionChunk::SectionChunk(ObjFile *f, const coff_section *h)
|
||||
: Chunk(SectionKind), file(f), header(h), repl(this) {
|
||||
SectionChunk::SectionChunk(ObjFile *f, const coff_section *h, Kind k)
|
||||
: Chunk(k), file(f), header(h), repl(this) {
|
||||
// Initialize relocs.
|
||||
if (file)
|
||||
setRelocs(file->getCOFFObj()->getRelocations(header));
|
||||
@ -410,6 +410,12 @@ void SectionChunk::writeTo(uint8_t *buf) const {
|
||||
|
||||
applyRelocation(buf + rel.VirtualAddress, rel);
|
||||
}
|
||||
|
||||
// Write the offset to EC entry thunk preceding section contents. The low bit
|
||||
// is always set, so it's effectively an offset from the last byte of the
|
||||
// offset.
|
||||
if (Defined *entryThunk = getEntryThunk())
|
||||
write32le(buf - sizeof(uint32_t), entryThunk->getRVA() - rva + 1);
|
||||
}
|
||||
|
||||
void SectionChunk::applyRelocation(uint8_t *off,
|
||||
|
||||
@ -55,7 +55,12 @@ enum : unsigned { Log2MaxSectionAlignment = 13 };
|
||||
// doesn't even have actual data (if common or bss).
|
||||
class Chunk {
|
||||
public:
|
||||
enum Kind : uint8_t { SectionKind, OtherKind, ImportThunkKind };
|
||||
enum Kind : uint8_t {
|
||||
SectionKind,
|
||||
SectionECKind,
|
||||
OtherKind,
|
||||
ImportThunkKind
|
||||
};
|
||||
Kind kind() const { return chunkKind; }
|
||||
|
||||
// Returns the size of this chunk (even if this is a common or BSS.)
|
||||
@ -120,6 +125,10 @@ public:
|
||||
llvm::Triple::ArchType getArch() const;
|
||||
std::optional<chpe_range_type> getArm64ECRangeType() const;
|
||||
|
||||
// ARM64EC entry thunk associated with the chunk.
|
||||
Defined *getEntryThunk() const;
|
||||
void setEntryThunk(Defined *entryThunk);
|
||||
|
||||
protected:
|
||||
Chunk(Kind k = OtherKind) : chunkKind(k), hasData(true), p2Align(0) {}
|
||||
|
||||
@ -176,7 +185,7 @@ public:
|
||||
// bytes, so this is used only for logging or debugging.
|
||||
virtual StringRef getDebugName() const { return ""; }
|
||||
|
||||
static bool classof(const Chunk *c) { return c->kind() != SectionKind; }
|
||||
static bool classof(const Chunk *c) { return c->kind() >= OtherKind; }
|
||||
|
||||
protected:
|
||||
NonSectionChunk(Kind k = OtherKind) : Chunk(k) {}
|
||||
@ -210,7 +219,7 @@ public:
|
||||
};
|
||||
|
||||
// A chunk corresponding a section of an input file.
|
||||
class SectionChunk final : public Chunk {
|
||||
class SectionChunk : public Chunk {
|
||||
// Identical COMDAT Folding feature accesses section internal data.
|
||||
friend class ICF;
|
||||
|
||||
@ -231,8 +240,8 @@ public:
|
||||
Symbol *operator*() const { return file->getSymbol(I->SymbolTableIndex); }
|
||||
};
|
||||
|
||||
SectionChunk(ObjFile *file, const coff_section *header);
|
||||
static bool classof(const Chunk *c) { return c->kind() == SectionKind; }
|
||||
SectionChunk(ObjFile *file, const coff_section *header, Kind k = SectionKind);
|
||||
static bool classof(const Chunk *c) { return c->kind() <= SectionECKind; }
|
||||
size_t getSize() const { return header->SizeOfRawData; }
|
||||
ArrayRef<uint8_t> getContents() const;
|
||||
void writeTo(uint8_t *buf) const;
|
||||
@ -393,6 +402,16 @@ private:
|
||||
uint32_t sectionNameSize = 0;
|
||||
};
|
||||
|
||||
// A section chunk corresponding a section of an EC input file.
|
||||
class SectionChunkEC final : public SectionChunk {
|
||||
public:
|
||||
static bool classof(const Chunk *c) { return c->kind() == SectionECKind; }
|
||||
|
||||
SectionChunkEC(ObjFile *file, const coff_section *header)
|
||||
: SectionChunk(file, header, SectionECKind) {}
|
||||
Defined *entryThunk = nullptr;
|
||||
};
|
||||
|
||||
// Inline methods to implement faux-virtual dispatch for SectionChunk.
|
||||
|
||||
inline size_t Chunk::getSize() const {
|
||||
@ -775,6 +794,17 @@ inline bool Chunk::isHotPatchable() const {
|
||||
return false;
|
||||
}
|
||||
|
||||
inline Defined *Chunk::getEntryThunk() const {
|
||||
if (auto *c = dyn_cast<const SectionChunkEC>(this))
|
||||
return c->entryThunk;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
inline void Chunk::setEntryThunk(Defined *entryThunk) {
|
||||
if (auto c = dyn_cast<SectionChunkEC>(this))
|
||||
c->entryThunk = entryThunk;
|
||||
}
|
||||
|
||||
void applyMOV32T(uint8_t *off, uint32_t v);
|
||||
void applyBranch24T(uint8_t *off, int32_t v);
|
||||
|
||||
|
||||
@ -2604,6 +2604,8 @@ void LinkerDriver::linkerMain(ArrayRef<const char *> argsArr) {
|
||||
if (auto *arg = args.getLastArg(OPT_print_symbol_order))
|
||||
config->printSymbolOrder = arg->getValue();
|
||||
|
||||
ctx.symtab.initializeEntryThunks();
|
||||
|
||||
// Identify unreferenced COMDAT sections.
|
||||
if (config->doGC) {
|
||||
if (config->mingw) {
|
||||
|
||||
@ -184,9 +184,7 @@ bool ICF::equalsConstant(const SectionChunk *a, const SectionChunk *b) {
|
||||
// Compare "moving" part of two sections, namely relocation targets.
|
||||
bool ICF::equalsVariable(const SectionChunk *a, const SectionChunk *b) {
|
||||
// Compare relocations.
|
||||
auto eq = [&](const coff_relocation &r1, const coff_relocation &r2) {
|
||||
Symbol *b1 = a->file->getSymbol(r1.SymbolTableIndex);
|
||||
Symbol *b2 = b->file->getSymbol(r2.SymbolTableIndex);
|
||||
auto eqSym = [&](Symbol *b1, Symbol *b2) {
|
||||
if (b1 == b2)
|
||||
return true;
|
||||
if (auto *d1 = dyn_cast<DefinedRegular>(b1))
|
||||
@ -194,6 +192,17 @@ bool ICF::equalsVariable(const SectionChunk *a, const SectionChunk *b) {
|
||||
return d1->getChunk()->eqClass[cnt % 2] == d2->getChunk()->eqClass[cnt % 2];
|
||||
return false;
|
||||
};
|
||||
auto eq = [&](const coff_relocation &r1, const coff_relocation &r2) {
|
||||
Symbol *b1 = a->file->getSymbol(r1.SymbolTableIndex);
|
||||
Symbol *b2 = b->file->getSymbol(r2.SymbolTableIndex);
|
||||
return eqSym(b1, b2);
|
||||
};
|
||||
|
||||
Symbol *e1 = a->getEntryThunk();
|
||||
Symbol *e2 = b->getEntryThunk();
|
||||
if ((e1 || e2) && (!e1 || !e2 || !eqSym(e1, e2)))
|
||||
return false;
|
||||
|
||||
return std::equal(a->getRelocs().begin(), a->getRelocs().end(),
|
||||
b->getRelocs().begin(), eq) &&
|
||||
assocEquals(a, b);
|
||||
|
||||
@ -152,6 +152,38 @@ void ObjFile::parseLazy() {
|
||||
}
|
||||
}
|
||||
|
||||
struct ECMapEntry {
|
||||
ulittle32_t src;
|
||||
ulittle32_t dst;
|
||||
ulittle32_t type;
|
||||
};
|
||||
|
||||
void ObjFile::initializeECThunks() {
|
||||
for (SectionChunk *chunk : hybmpChunks) {
|
||||
if (chunk->getContents().size() % sizeof(ECMapEntry)) {
|
||||
error("Invalid .hybmp chunk size " + Twine(chunk->getContents().size()));
|
||||
continue;
|
||||
}
|
||||
|
||||
const uint8_t *end =
|
||||
chunk->getContents().data() + chunk->getContents().size();
|
||||
for (const uint8_t *iter = chunk->getContents().data(); iter != end;
|
||||
iter += sizeof(ECMapEntry)) {
|
||||
auto entry = reinterpret_cast<const ECMapEntry *>(iter);
|
||||
switch (entry->type) {
|
||||
case Arm64ECThunkType::Entry:
|
||||
ctx.symtab.addEntryThunk(getSymbol(entry->src), getSymbol(entry->dst));
|
||||
break;
|
||||
case Arm64ECThunkType::Exit:
|
||||
case Arm64ECThunkType::GuestExit:
|
||||
break;
|
||||
default:
|
||||
warn("Ignoring unknown EC thunk type " + Twine(entry->type));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ObjFile::parse() {
|
||||
// Parse a memory buffer as a COFF file.
|
||||
std::unique_ptr<Binary> bin = CHECK(createBinary(mb), this);
|
||||
@ -168,6 +200,7 @@ void ObjFile::parse() {
|
||||
initializeSymbols();
|
||||
initializeFlags();
|
||||
initializeDependencies();
|
||||
initializeECThunks();
|
||||
}
|
||||
|
||||
const coff_section *ObjFile::getSection(uint32_t i) {
|
||||
@ -242,7 +275,11 @@ SectionChunk *ObjFile::readSection(uint32_t sectionNumber,
|
||||
|
||||
if (sec->Characteristics & llvm::COFF::IMAGE_SCN_LNK_REMOVE)
|
||||
return nullptr;
|
||||
auto *c = make<SectionChunk>(this, sec);
|
||||
SectionChunk *c;
|
||||
if (isArm64EC(getMachineType()))
|
||||
c = make<SectionChunkEC>(this, sec);
|
||||
else
|
||||
c = make<SectionChunk>(this, sec);
|
||||
if (def)
|
||||
c->checksum = def->CheckSum;
|
||||
|
||||
@ -260,6 +297,8 @@ SectionChunk *ObjFile::readSection(uint32_t sectionNumber,
|
||||
guardEHContChunks.push_back(c);
|
||||
else if (name == ".sxdata")
|
||||
sxDataChunks.push_back(c);
|
||||
else if (isArm64EC(getMachineType()) && name == ".hybmp$x")
|
||||
hybmpChunks.push_back(c);
|
||||
else if (ctx.config.tailMerge && sec->NumberOfRelocations == 0 &&
|
||||
name == ".rdata" && leaderName.starts_with("??_C@"))
|
||||
// COFF sections that look like string literal sections (i.e. no
|
||||
|
||||
@ -227,6 +227,7 @@ private:
|
||||
void initializeSymbols();
|
||||
void initializeFlags();
|
||||
void initializeDependencies();
|
||||
void initializeECThunks();
|
||||
|
||||
SectionChunk *
|
||||
readSection(uint32_t sectionNumber,
|
||||
@ -292,6 +293,8 @@ private:
|
||||
std::vector<SectionChunk *> guardLJmpChunks;
|
||||
std::vector<SectionChunk *> guardEHContChunks;
|
||||
|
||||
std::vector<SectionChunk *> hybmpChunks;
|
||||
|
||||
// This vector contains a list of all symbols defined or referenced by this
|
||||
// file. They are indexed such that you can get a Symbol by symbol
|
||||
// index. Nonexistent indices (which are occupied by auxiliary
|
||||
|
||||
@ -68,6 +68,10 @@ void markLive(COFFLinkerContext &ctx) {
|
||||
// Mark associative sections if any.
|
||||
for (SectionChunk &c : sc->children())
|
||||
enqueue(&c);
|
||||
|
||||
// Mark EC entry thunks.
|
||||
if (Defined *entryThunk = sc->getEntryThunk())
|
||||
addSym(entryThunk);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -561,6 +561,28 @@ std::pair<Symbol *, bool> SymbolTable::insert(StringRef name, InputFile *file) {
|
||||
return result;
|
||||
}
|
||||
|
||||
void SymbolTable::addEntryThunk(Symbol *from, Symbol *to) {
|
||||
entryThunks.push_back({from, to});
|
||||
}
|
||||
|
||||
void SymbolTable::initializeEntryThunks() {
|
||||
for (auto it : entryThunks) {
|
||||
auto *to = dyn_cast<Defined>(it.second);
|
||||
if (!to)
|
||||
continue;
|
||||
auto *from = dyn_cast<DefinedRegular>(it.first);
|
||||
// We need to be able to add padding to the function and fill it with an
|
||||
// offset to its entry thunks. To ensure that padding the function is
|
||||
// feasible, functions are required to be COMDAT symbols with no offset.
|
||||
if (!from || !from->getChunk()->isCOMDAT() ||
|
||||
cast<DefinedRegular>(from)->getValue()) {
|
||||
error("non COMDAT symbol '" + from->getName() + "' in hybrid map");
|
||||
continue;
|
||||
}
|
||||
from->getChunk()->setEntryThunk(to);
|
||||
}
|
||||
}
|
||||
|
||||
Symbol *SymbolTable::addUndefined(StringRef name, InputFile *f,
|
||||
bool isWeakAlias) {
|
||||
auto [s, wasInserted] = insert(name, f);
|
||||
|
||||
@ -106,6 +106,8 @@ public:
|
||||
Symbol *addImportThunk(StringRef name, DefinedImportData *s,
|
||||
uint16_t machine);
|
||||
void addLibcall(StringRef name);
|
||||
void addEntryThunk(Symbol *from, Symbol *to);
|
||||
void initializeEntryThunks();
|
||||
|
||||
void reportDuplicate(Symbol *existing, InputFile *newFile,
|
||||
SectionChunk *newSc = nullptr,
|
||||
@ -134,6 +136,7 @@ private:
|
||||
llvm::DenseMap<llvm::CachedHashStringRef, Symbol *> symMap;
|
||||
std::unique_ptr<BitcodeCompiler> lto;
|
||||
bool ltoCompilationDone = false;
|
||||
std::vector<std::pair<Symbol *, Symbol *>> entryThunks;
|
||||
|
||||
COFFLinkerContext &ctx;
|
||||
};
|
||||
|
||||
@ -1532,6 +1532,10 @@ void Writer::assignAddresses() {
|
||||
}
|
||||
if (padding && c->isHotPatchable())
|
||||
virtualSize += padding;
|
||||
// If chunk has EC entry thunk, reserve a space for an offset to the
|
||||
// thunk.
|
||||
if (c->getEntryThunk())
|
||||
virtualSize += sizeof(uint32_t);
|
||||
virtualSize = alignTo(virtualSize, c->getAlignment());
|
||||
c->setRVA(rva + virtualSize);
|
||||
virtualSize += c->getSize();
|
||||
|
||||
375
lld/test/COFF/arm64ec-entry-thunk.s
Normal file
375
lld/test/COFF/arm64ec-entry-thunk.s
Normal file
@ -0,0 +1,375 @@
|
||||
// REQUIRES: aarch64
|
||||
// RUN: split-file %s %t.dir && cd %t.dir
|
||||
|
||||
#--- test-simple.s
|
||||
// Build a simple function with an entry thunk.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
.data
|
||||
.rva func
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows %S/Inputs/loadconfig-arm64ec.s -o loadcfg.obj
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-simple.s -o test-simple.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-simple.dll loadcfg.obj test-simple.obj
|
||||
// RUN: llvm-objdump -d out-simple.dll | FileCheck --check-prefix=DISASM %s
|
||||
|
||||
// DISASM: Disassembly of section .text:
|
||||
// DISASM-EMPTY:
|
||||
// DISASM-NEXT: 0000000180001000 <.text>:
|
||||
// DISASM-NEXT: 180001000: 00000009 udf #0x9
|
||||
// DISASM-NEXT: 180001004: 52800020 mov w0, #0x1 // =1
|
||||
// DISASM-NEXT: 180001008: d65f03c0 ret
|
||||
// DISASM-NEXT: 18000100c: 52800140 mov w0, #0xa // =10
|
||||
// DISASM-NEXT: 180001010: d65f03c0 ret
|
||||
|
||||
// RUN: llvm-readobj --sections out-simple.dll | FileCheck --check-prefix=HYBMP %s
|
||||
// HYBMP-NOT: .hybmp
|
||||
|
||||
// RUN: lld-link -machine:arm64x -dll -noentry -out:out-simplex.dll loadcfg.obj test-simple.obj
|
||||
// RUN: llvm-objdump -d out-simplex.dll | FileCheck --check-prefix=DISASM %s
|
||||
|
||||
#--- test-split-func.s
|
||||
// Build a simple function with an entry thunk, but pass it in multiple files.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
#--- test-split-thunk.s
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
#--- test-split-hybmp.s
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
#--- test-split-data.s
|
||||
.data
|
||||
.rva func
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-split-func.s -o test-split-func.obj
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-split-thunk.s -o test-split-thunk.obj
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-split-hybmp.s -o test-split-hybmp.obj
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-split-data.s -o test-split-data.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-split.dll loadcfg.obj \
|
||||
// RUN: test-split-func.obj test-split-thunk.obj test-split-data.obj test-split-hybmp.obj
|
||||
// RUN: llvm-objdump -d out-split.dll | FileCheck --check-prefix=DISASM %s
|
||||
|
||||
#--- test-align.s
|
||||
// Build multiple functions with thunks and various alignments and check that entry thunk offsets
|
||||
// are correctly placed.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
nop
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func2
|
||||
.globl func2
|
||||
.p2align 2
|
||||
func2:
|
||||
mov w0, #2
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func3
|
||||
.globl func3
|
||||
.p2align 3
|
||||
func3:
|
||||
mov w0, #3
|
||||
nop
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func4
|
||||
.globl func4
|
||||
.p2align 3
|
||||
func4:
|
||||
mov w0, #4
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func5
|
||||
.globl func5
|
||||
.p2align 3
|
||||
func5:
|
||||
mov w0, #5
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func6
|
||||
.globl func6
|
||||
.p2align 4
|
||||
func6:
|
||||
mov w0, #6
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk2
|
||||
.globl thunk2
|
||||
.p2align 2
|
||||
thunk2:
|
||||
mov w0, #20
|
||||
ret
|
||||
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func2
|
||||
.symidx thunk2
|
||||
.word 1 // entry thunk
|
||||
.symidx func3
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func4
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func5
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func6
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
.data
|
||||
.rva func
|
||||
.rva func2
|
||||
.rva func3
|
||||
.rva func4
|
||||
.rva func5
|
||||
.rva func6
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-align.s -o test-align.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-align.dll loadcfg.obj test-align.obj
|
||||
// RUN: llvm-objdump -d out-align.dll | FileCheck --check-prefix=ALIGN %s
|
||||
|
||||
// ALIGN: Disassembly of section .text:
|
||||
// ALIGN-EMPTY:
|
||||
// ALIGN-NEXT: 0000000180001000 <.text>:
|
||||
// ALIGN-NEXT: 180001000: 00000055 udf #0x55
|
||||
// ALIGN-NEXT: 180001004: 52800020 mov w0, #0x1 // =1
|
||||
// ALIGN-NEXT: 180001008: d503201f nop
|
||||
// ALIGN-NEXT: 18000100c: d65f03c0 ret
|
||||
// ALIGN-NEXT: 180001010: 0000004d udf #0x4d
|
||||
// ALIGN-NEXT: 180001014: 52800040 mov w0, #0x2 // =2
|
||||
// ALIGN-NEXT: 180001018: d65f03c0 ret
|
||||
// ALIGN-NEXT: 18000101c: 00000039 udf #0x39
|
||||
// ALIGN-NEXT: 180001020: 52800060 mov w0, #0x3 // =3
|
||||
// ALIGN-NEXT: 180001024: d503201f nop
|
||||
// ALIGN-NEXT: 180001028: d65f03c0 ret
|
||||
// ALIGN-NEXT: 18000102c: 00000029 udf #0x29
|
||||
// ALIGN-NEXT: 180001030: 52800080 mov w0, #0x4 // =4
|
||||
// ALIGN-NEXT: 180001034: d65f03c0 ret
|
||||
// ALIGN-NEXT: 180001038: 00000000 udf #0x0
|
||||
// ALIGN-NEXT: 18000103c: 00000019 udf #0x19
|
||||
// ALIGN-NEXT: 180001040: 528000a0 mov w0, #0x5 // =5
|
||||
// ALIGN-NEXT: 180001044: d65f03c0 ret
|
||||
// ALIGN-NEXT: 180001048: 00000000 udf #0x0
|
||||
// ALIGN-NEXT: 18000104c: 00000009 udf #0x9
|
||||
// ALIGN-NEXT: 180001050: 528000c0 mov w0, #0x6 // =6
|
||||
// ALIGN-NEXT: 180001054: d65f03c0 ret
|
||||
// ALIGN-NEXT: 180001058: 52800140 mov w0, #0xa // =10
|
||||
// ALIGN-NEXT: 18000105c: d65f03c0 ret
|
||||
// ALIGN-NEXT: 180001060: 52800280 mov w0, #0x14 // =20
|
||||
// ALIGN-NEXT: 180001064: d65f03c0 ret
|
||||
|
||||
#--- test-icf-thunk.s
|
||||
// Build two functions with identical entry thunks and check that thunks are merged by ICF.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func2
|
||||
.globl func2
|
||||
.p2align 2
|
||||
func2:
|
||||
mov w0, #2
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk2
|
||||
.globl thunk2
|
||||
.p2align 2
|
||||
thunk2:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func2
|
||||
.symidx thunk2
|
||||
.word 1 // entry thunk
|
||||
|
||||
.data
|
||||
.rva func
|
||||
.rva func2
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-icf-thunk.s -o test-icf-thunk.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-icf-thunk.dll loadcfg.obj test-icf-thunk.obj
|
||||
// RUN: llvm-objdump -d out-icf-thunk.dll | FileCheck --check-prefix=ICF-THUNK %s
|
||||
|
||||
// ICF-THUNK: Disassembly of section .text:
|
||||
// ICF-THUNK-EMPTY:
|
||||
// ICF-THUNK-NEXT: 0000000180001000 <.text>:
|
||||
// ICF-THUNK-NEXT: 180001000: 00000015 udf #0x15
|
||||
// ICF-THUNK-NEXT: 180001004: 52800020 mov w0, #0x1 // =1
|
||||
// ICF-THUNK-NEXT: 180001008: d65f03c0 ret
|
||||
// ICF-THUNK-NEXT: 18000100c: 00000009 udf #0x9
|
||||
// ICF-THUNK-NEXT: 180001010: 52800040 mov w0, #0x2 // =2
|
||||
// ICF-THUNK-NEXT: 180001014: d65f03c0 ret
|
||||
// ICF-THUNK-NEXT: 180001018: 52800140 mov w0, #0xa // =10
|
||||
// ICF-THUNK-NEXT: 18000101c: d65f03c0 ret
|
||||
|
||||
#--- test-icf-diff-thunk.s
|
||||
// Build two identical functions with different entry thunks and check that they are not merged by ICF.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func2
|
||||
.globl func2
|
||||
.p2align 2
|
||||
func2:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk2
|
||||
.globl thunk2
|
||||
.p2align 2
|
||||
thunk2:
|
||||
mov w0, #20
|
||||
ret
|
||||
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func2
|
||||
.symidx thunk2
|
||||
.word 1 // entry thunk
|
||||
|
||||
.data
|
||||
.rva func
|
||||
.rva func2
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-icf-diff-thunk.s -o test-icf-diff-thunk.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-icf-diff-thunk.dll loadcfg.obj test-icf-diff-thunk.obj
|
||||
// RUN: llvm-objdump -d out-icf-diff-thunk.dll | FileCheck --check-prefix=ICF-DIFF-THUNK %s
|
||||
|
||||
// ICF-DIFF-THUNK: Disassembly of section .text:
|
||||
// ICF-DIFF-THUNK-EMPTY:
|
||||
// ICF-DIFF-THUNK-NEXT: 0000000180001000 <.text>:
|
||||
// ICF-DIFF-THUNK-NEXT: 180001000: 00000015 udf #0x15
|
||||
// ICF-DIFF-THUNK-NEXT: 180001004: 52800020 mov w0, #0x1 // =1
|
||||
// ICF-DIFF-THUNK-NEXT: 180001008: d65f03c0 ret
|
||||
// ICF-DIFF-THUNK-NEXT: 18000100c: 00000011 udf #0x11
|
||||
// ICF-DIFF-THUNK-NEXT: 180001010: 52800020 mov w0, #0x1 // =1
|
||||
// ICF-DIFF-THUNK-NEXT: 180001014: d65f03c0 ret
|
||||
// ICF-DIFF-THUNK-NEXT: 180001018: 52800140 mov w0, #0xa // =10
|
||||
// ICF-DIFF-THUNK-NEXT: 18000101c: d65f03c0 ret
|
||||
// ICF-DIFF-THUNK-NEXT: 180001020: 52800280 mov w0, #0x14 // =20
|
||||
// ICF-DIFF-THUNK-NEXT: 180001024: d65f03c0 ret
|
||||
|
||||
#--- test-icf-both.s
|
||||
// Build two identical functions with identical entry thunks and check that they are merged by ICF.
|
||||
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .text,"xr",discard,func2
|
||||
.globl func2
|
||||
.p2align 2
|
||||
func2:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk2
|
||||
.globl thunk2
|
||||
.p2align 2
|
||||
thunk2:
|
||||
mov w0, #10
|
||||
ret
|
||||
|
||||
.section .hybmp$x, "yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
.symidx func2
|
||||
.symidx thunk2
|
||||
.word 1 // entry thunk
|
||||
|
||||
.data
|
||||
.rva func
|
||||
.rva func2
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows test-icf-both.s -o test-icf-both.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:out-icf-both.dll loadcfg.obj test-icf-both.obj
|
||||
// RUN: llvm-objdump -d out-icf-both.dll | FileCheck --check-prefix=DISASM %s
|
||||
|
||||
114
lld/test/COFF/arm64ec-hybmp.s
Normal file
114
lld/test/COFF/arm64ec-hybmp.s
Normal file
@ -0,0 +1,114 @@
|
||||
REQUIRES: aarch64
|
||||
RUN: split-file %s %t.dir && cd %t.dir
|
||||
|
||||
#--- text-func.s
|
||||
.text
|
||||
.globl func
|
||||
.p2align 2, 0x0
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
ret
|
||||
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows text-func.s -o text-func.obj
|
||||
// RUN: not lld-link -machine:arm64ec -dll -noentry -out:test.dll text-func.obj 2>&1 | FileCheck -check-prefix=FUNC-NON-COMDAT %s
|
||||
// FUNC-NON-COMDAT: error: non COMDAT symbol 'func' in hybrid map
|
||||
|
||||
#--- offset-func.s
|
||||
.section .text,"xr",discard,func
|
||||
// Add an instruction before func label to make adding entry thunk offset in the padding impossible.
|
||||
mov w0, #2
|
||||
.globl func
|
||||
.p2align 2, 0x0
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
ret
|
||||
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows offset-func.s -o offset-func.obj
|
||||
// RUN: not lld-link -machine:arm64ec -dll -noentry -out:test.dll offset-func.obj 2>&1 | FileCheck -check-prefix=FUNC-NON-COMDAT %s
|
||||
|
||||
#--- undef-func.s
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
ret
|
||||
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows undef-func.s -o undef-func.obj
|
||||
// RUN: not lld-link -machine:arm64ec -dll -noentry -out:test.dll undef-func.obj 2>&1 | FileCheck -check-prefix=UNDEF-FUNC %s
|
||||
// UNDEF-FUNC: error: undefined symbol: func
|
||||
|
||||
#--- undef-thunk.s
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2, 0x0
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 1 // entry thunk
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows undef-thunk.s -o undef-thunk.obj
|
||||
// RUN: not lld-link -machine:arm64ec -dll -noentry -out:test.dll undef-thunk.obj 2>&1 | FileCheck -check-prefix=UNDEF-THUNK %s
|
||||
// UNDEF-THUNK: error: undefined symbol: thunk
|
||||
|
||||
#--- invalid-type.s
|
||||
.section .text,"xr",discard,func
|
||||
.globl func
|
||||
.p2align 2, 0x0
|
||||
func:
|
||||
mov w0, #1
|
||||
ret
|
||||
|
||||
.section .wowthk$aa,"xr",discard,thunk
|
||||
.globl thunk
|
||||
.p2align 2
|
||||
thunk:
|
||||
ret
|
||||
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
.word 3
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows invalid-type.s -o invalid-type.obj
|
||||
// RUN: lld-link -machine:arm64ec -dll -noentry -out:test.dll invalid-type.obj 2>&1 | FileCheck -check-prefix=INVALID-TYPE %s
|
||||
// INVALID-TYPE: warning: Ignoring unknown EC thunk type 3
|
||||
|
||||
#--- invalid-size.s
|
||||
.section .hybmp$x,"yi"
|
||||
.symidx func
|
||||
.symidx thunk
|
||||
|
||||
// RUN: llvm-mc -filetype=obj -triple=arm64ec-windows invalid-size.s -o invalid-size.obj
|
||||
// RUN: not lld-link -machine:arm64ec -dll -noentry -out:test.dll invalid-size.obj 2>&1 | FileCheck -check-prefix=INVALID-SIZE %s
|
||||
// INVALID-SIZE: error: Invalid .hybmp chunk size 8
|
||||
@ -806,7 +806,7 @@ enum Feat00Flags : uint32_t {
|
||||
Kernel = 0x40000000,
|
||||
};
|
||||
|
||||
enum class Arm64ECThunkType : uint8_t {
|
||||
enum Arm64ECThunkType : uint8_t {
|
||||
GuestExit = 0,
|
||||
Entry = 1,
|
||||
Exit = 4,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user