Skip to content

[LLD][COFF] Add Support for ARM64EC Import Thunks #108460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 13, 2024
Merged

[LLD][COFF] Add Support for ARM64EC Import Thunks #108460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions lld/COFF/Chunks.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,13 +601,17 @@ class ImportThunkChunkARM : public ImportThunkChunk {

class ImportThunkChunkARM64 : public ImportThunkChunk {
public:
explicit ImportThunkChunkARM64(COFFLinkerContext &ctx, Defined *s)
: ImportThunkChunk(ctx, s) {
explicit ImportThunkChunkARM64(COFFLinkerContext &ctx, Defined *s,
MachineTypes machine)
: ImportThunkChunk(ctx, s), machine(machine) {
setAlignment(4);
}
size_t getSize() const override { return sizeof(importThunkARM64); }
void writeTo(uint8_t *buf) const override;
MachineTypes getMachine() const override { return ARM64; }
MachineTypes getMachine() const override { return machine; }

private:
MachineTypes machine;
};

// ARM64EC __impchk_* thunk implementation.
Expand Down
11 changes: 9 additions & 2 deletions lld/COFF/InputFiles.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ ImportThunkChunk *ImportFile::makeImportThunk() {
case I386:
return make<ImportThunkChunkX86>(ctx, impSym);
case ARM64:
return make<ImportThunkChunkARM64>(ctx, impSym);
return make<ImportThunkChunkARM64>(ctx, impSym, ARM64);
case ARMNT:
return make<ImportThunkChunkARM>(ctx, impSym);
}
Expand Down Expand Up @@ -1109,7 +1109,14 @@ void ImportFile::parse() {
} else {
thunkSym = ctx.symtab.addImportThunk(
name, impSym, make<ImportThunkChunkX64>(ctx, impSym));
// FIXME: Add aux IAT symbols.

if (std::optional<std::string> mangledName =
getArm64ECMangledFunctionName(name)) {
StringRef auxThunkName = saver().save(*mangledName);
auxThunkSym = ctx.symtab.addImportThunk(
auxThunkName, impECSym,
make<ImportThunkChunkARM64>(ctx, impECSym, ARM64EC));
}

StringRef impChkName = saver().save("__impchk_" + name);
impchkThunk = make<ImportThunkChunkARM64EC>(this);
Expand Down
1 change: 1 addition & 0 deletions lld/COFF/InputFiles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ class ImportFile : public InputFile {
// Auxiliary IAT symbol and chunk on ARM64EC.
DefinedImportData *impECSym = nullptr;
Chunk *auxLocation = nullptr;
Symbol *auxThunkSym = nullptr;

// We want to eliminate dllimported symbols if no one actually refers to them.
// These "Live" bits are used to keep track of which import library members
Expand Down
22 changes: 15 additions & 7 deletions lld/COFF/Writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1252,14 +1252,22 @@ void Writer::appendImportThunks() {
if (!file->live)
continue;

if (!file->thunkSym)
continue;
if (file->thunkSym) {
if (!isa<DefinedImportThunk>(file->thunkSym))
fatal(toString(ctx, *file->thunkSym) + " was replaced");
auto *chunk = cast<DefinedImportThunk>(file->thunkSym)->getChunk();
if (chunk->live)
textSec->addChunk(chunk);
}

if (file->auxThunkSym) {
if (!isa<DefinedImportThunk>(file->auxThunkSym))
fatal(toString(ctx, *file->auxThunkSym) + " was replaced");
auto *chunk = cast<DefinedImportThunk>(file->auxThunkSym)->getChunk();
if (chunk->live)
textSec->addChunk(chunk);
}

if (!isa<DefinedImportThunk>(file->thunkSym))
fatal(toString(ctx, *file->thunkSym) + " was replaced");
DefinedImportThunk *thunk = cast<DefinedImportThunk>(file->thunkSym);
if (thunk->getChunk()->live)
textSec->addChunk(thunk->getChunk());
if (file->impchkThunk)
textSec->addChunk(file->impchkThunk);
}
Expand Down
55 changes: 32 additions & 23 deletions lld/test/COFF/arm64ec-import.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,40 @@ RUN: llvm-objdump -d out2.dll | FileCheck --check-prefix=DISASM %s

DISASM: 180001000: 52800000 mov w0, #0x0 // =0
DISASM-NEXT: 180001004: d65f03c0 ret
DISASM-NEXT: 180001008: d000000b adrp x11, 0x180003000
DISASM-NEXT: 18000100c: f940056b ldr x11, [x11, #0x8]
DISASM-NEXT: 180001010: 9000000a adrp x10, 0x180001000 <.text>
DISASM-NEXT: 180001014: 9101114a add x10, x10, #0x44
DISASM-NEXT: 180001018: 17fffffa b 0x180001000 <.text>
DISASM-NEXT: 18000101c: d000000b adrp x11, 0x180003000
DISASM-NEXT: 180001020: f940096b ldr x11, [x11, #0x10]
DISASM-NEXT: 180001024: f0ffffea adrp x10, 0x180000000
DISASM-NEXT: 180001028: 9100014a add x10, x10, #0x0
DISASM-NEXT: 18000102c: 17fffff5 b 0x180001000 <.text>
DISASM-NEXT: 180001030: d000000b adrp x11, 0x180003000
DISASM-NEXT: 180001034: f940116b ldr x11, [x11, #0x20]
DISASM-NEXT: 180001038: 9000000a adrp x10, 0x180001000 <.text>
DISASM-NEXT: 18000103c: 9101314a add x10, x10, #0x4c
DISASM-NEXT: 180001040: 17fffff0 b 0x180001000 <.text>
DISASM-NEXT: 180001044: 52800020 mov w0, #0x1 // =1
DISASM-NEXT: 180001048: d65f03c0 ret
DISASM-NEXT: 18000104c: 52800040 mov w0, #0x2 // =2
DISASM-NEXT: 180001050: d65f03c0 ret
DISASM-NEXT: 180001008: 90000030 adrp x16, 0x180005000
DISASM-NEXT: 18000100c: f9400610 ldr x16, [x16, #0x8]
DISASM-NEXT: 180001010: d61f0200 br x16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So the existing thunks use x11/x10, but these ones uses x16 like they used to, for regular arm64. I had to check, but x16 does indeed seem to be kosher to use on arm64ec.

DISASM-NEXT: 180001014: d000000b adrp x11, 0x180003000
DISASM-NEXT: 180001018: f940056b ldr x11, [x11, #0x8]
DISASM-NEXT: 18000101c: 9000000a adrp x10, 0x180001000 <.text>
DISASM-NEXT: 180001020: 9101714a add x10, x10, #0x5c
DISASM-NEXT: 180001024: 17fffff7 b 0x180001000 <.text>
DISASM-NEXT: 180001028: d000000b adrp x11, 0x180003000
DISASM-NEXT: 18000102c: f940096b ldr x11, [x11, #0x10]
DISASM-NEXT: 180001030: f0ffffea adrp x10, 0x180000000
DISASM-NEXT: 180001034: 9100014a add x10, x10, #0x0
DISASM-NEXT: 180001038: 17fffff2 b 0x180001000 <.text>
DISASM-NEXT: 18000103c: 90000030 adrp x16, 0x180005000
DISASM-NEXT: 180001040: f9401210 ldr x16, [x16, #0x20]
DISASM-NEXT: 180001044: d61f0200 br x16
DISASM-NEXT: 180001048: d000000b adrp x11, 0x180003000
DISASM-NEXT: 18000104c: f940116b ldr x11, [x11, #0x20]
DISASM-NEXT: 180001050: 9000000a adrp x10, 0x180001000 <.text>
DISASM-NEXT: 180001054: 9101914a add x10, x10, #0x64
DISASM-NEXT: 180001058: 17ffffea b 0x180001000 <.text>
DISASM-NEXT: 18000105c: 52800020 mov w0, #0x1 // =1
DISASM-NEXT: 180001060: d65f03c0 ret
DISASM-NEXT: 180001064: 52800040 mov w0, #0x2 // =2
DISASM-NEXT: 180001068: d65f03c0 ret
DISASM-NEXT: ...
DISASM-NEXT: 180002000: ff 25 02 10 00 00 jmpq *0x1002(%rip) # 0x180003008

RUN: llvm-readobj --hex-dump=.test out.dll | FileCheck --check-prefix=TESTSEC %s
RUN: llvm-readobj --hex-dump=.test out2.dll | FileCheck --check-prefix=TESTSEC %s
TESTSEC: 0x180007000 08500000 00300000 10500000 20500000
TESTSEC-NEXT: 0x180007010 08300000 00500000 10300000 20300000
TESTSEC-NEXT: 0x180007020 08100000 1c100000 00200000
TESTSEC-NEXT: 0x180007020 14100000 28100000 00200000 08100000
TESTSEC-NEXT: 0x180007030 3c100000

RUN: llvm-readobj --headers out.dll | FileCheck -check-prefix=HEADERS %s
HEADERS: LoadConfigTableRVA: 0x4010
Expand All @@ -76,9 +83,9 @@ RUN: llvm-readobj --coff-load-config out.dll | FileCheck -check-prefix=LOADCONFI
LOADCONFIG: AuxiliaryIAT: 0x5000

RUN: llvm-readobj --hex-dump=.rdata out.dll | FileCheck -check-prefix=RDATA %s
RDATA: 0x180005000 00000000 00000000 08100080 01000000
RDATA-NEXT: 0x180005010 1c100080 01000000 00000000 00000000
RDATA-NEXT: 0x180005020 30100080 01000000 00000000 00000000
RDATA: 0x180005000 00000000 00000000 14100080 01000000
RDATA-NEXT: 0x180005010 28100080 01000000 00000000 00000000
RDATA-NEXT: 0x180005020 48100080 01000000 00000000 00000000

RUN: llvm-readobj --coff-basereloc out.dll | FileCheck -check-prefix=BASERELOC %s
BASERELOC: BaseReloc [
Expand Down Expand Up @@ -110,6 +117,8 @@ arm64ec_data_sym:
.rva __impchk_func
.rva __impchk_func2
.rva func
.rva "#func"
.rva "#t2func"

#--- icall.s
.text
Expand Down
Loading