This is an archive of the discontinued LLVM Phabricator instance.

Differential D34833

[LLD] [COFF] Add initial support for linking ARM64 binaries
ClosedPublic

Authored by mstorsjo on Jun 29 2017, 1:32 PM.

Details

Reviewers
ruiu
compnerd
Commits
rG94fce5095053: [COFF] Add initial support for linking ARM64 binaries
rLLD306963: [COFF] Add initial support for linking ARM64 binaries
rL306963: [COFF] Add initial support for linking ARM64 binaries
Summary

A plain empty entry point function that returns 0 seems to produce a binary that loads and runs fine in wine.

Diff Detail

Repository
rL LLVM

Event Timeline

mstorsjo created this revision.Jun 29 2017, 1:32 PM
Herald added subscribers: kristof.beyls, aemerson. · View Herald TranscriptJun 29 2017, 1:32 PM
ruiu edited edge metadata.Jun 29 2017, 1:34 PM

Can you add a testcase?

This patch seems too simple to submit. Do you think you can improve it so that you can create an executable that does nothing but just exit with 0?

mstorsjo updated this revision to Diff 104733.Jun 29 2017, 2:10 PM
mstorsjo edited the summary of this revision. (Show Details)

Added a testcase, sorted the ARM64 declaration alphabetically.

The test case checks the pe32+ magic value, which llvm-readobj doesn't output (yet), but I'll send a separate patch for that.

Herald added a subscriber: javed.absar. · View Herald TranscriptJun 29 2017, 2:10 PM
mstorsjo added a comment.Jun 29 2017, 2:16 PM

The testcase depends on D34836.

mstorsjo updated this revision to Diff 104739.Jun 29 2017, 2:28 PM

Updated the test case to check for a hex printout.

ruiu added a comment.Jun 29 2017, 2:30 PM

Are you able to create an executable that exits 0 using this patch?

mstorsjo added a comment.Jun 29 2017, 2:32 PM
In D34833#795864, @ruiu wrote:

Are you able to create an executable that exits 0 using this patch?

Yes; the executable built by the test does that - tested in wine (which is the only arm64 windows environment I've got; prior to this patch it didn't work).

ruiu added inline comments.Jun 29 2017, 2:36 PM
test/COFF/arm64-magic.test
1 ↗(On Diff #104739)

Rename this file arm64-magic.yaml and merge with Inputs/arm64-executable.obj.yaml.

mstorsjo updated this revision to Diff 104741.Jun 29 2017, 2:43 PM

Merged the test files as suggested.

ruiu added a comment.Jun 29 2017, 2:46 PM

Does this patch emits other headers correctly? See lld/test/COFF/hello32.test as an example for i386.

mstorsjo added a comment.Jun 29 2017, 2:56 PM
In D34833#795887, @ruiu wrote:

Does this patch emits other headers correctly? See lld/test/COFF/hello32.test as an example for i386.

I think it's mostly right enough so far, although I haven't checked everything in detail yet - at least it seemed right enough for wine to run, and after fixing the is64 function, most of the critical flags seem to match the upstream microsoft arm64 exes I've got to compare to.

ruiu added a comment.Jun 29 2017, 3:01 PM

But at least you want to make sure that these bits are updated for ARM64, right?

HEADER:      Format: COFF-i386
HEADER-NEXT: Arch: i386
HEADER-NEXT: AddressSize: 32bit
HEADER-NEXT: ImageFileHeader {
HEADER-NEXT:   Machine: IMAGE_FILE_MACHINE_I386 (0x14C)
mstorsjo updated this revision to Diff 104828.Jun 30 2017, 12:30 AM

Added a few more trivial cases where the arm64 machine type is mapped, extended the test to check more flags. I've doublechecked the flags that the test checks with binaries from microsoft.

mstorsjo added a comment.Jul 1 2017, 2:33 AM

Rui, is this version ok now?

ruiu accepted this revision.Jul 1 2017, 5:21 AM

Yes, it LGTM. Thank you for doing this!

This revision is now accepted and ready to land.Jul 1 2017, 5:21 AM
Closed by commit rL306963: [COFF] Add initial support for linking ARM64 binaries (authored by mstorsjo). · Explain WhyJul 1 2017, 1:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
COFF/
3 lines
3 lines
2 lines
test/
COFF/
46 lines

Diff 105003

lld/trunk/COFF/Config.h

Show All 25 Lines
class DefinedAbsolute; class DefinedAbsolute;
class DefinedRelative; class DefinedRelative;
class StringChunk; class StringChunk;
struct Symbol; struct Symbol;
class SymbolBody; class SymbolBody;
// Short aliases. // Short aliases.
static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64; static const auto AMD64 = llvm::COFF::IMAGE_FILE_MACHINE_AMD64;
static const auto ARM64 = llvm::COFF::IMAGE_FILE_MACHINE_ARM64;
static const auto ARMNT = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT; static const auto ARMNT = llvm::COFF::IMAGE_FILE_MACHINE_ARMNT;
static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386; static const auto I386 = llvm::COFF::IMAGE_FILE_MACHINE_I386;
// Represents an /export option. // Represents an /export option.
struct Export { struct Export {
StringRef Name; // N in /export:N or /export:E=N StringRef Name; // N in /export:N or /export:E=N
StringRef ExtName; // E in /export:E=N StringRef ExtName; // E in /export:E=N
SymbolBody *Sym = nullptr; SymbolBody *Sym = nullptr;
Show All 26 Linesenum class DebugType {
CV = 0x1, /// CodeView CV = 0x1, /// CodeView
PData = 0x2, /// Procedure Data PData = 0x2, /// Procedure Data
Fixup = 0x4, /// Relocation Table Fixup = 0x4, /// Relocation Table
}; };
// Global configuration. // Global configuration.
struct Configuration { struct Configuration {
enum ManifestKind { SideBySide, Embed, No }; enum ManifestKind { SideBySide, Embed, No };
bool is64() { return Machine == AMD64; } bool is64() { return Machine == AMD64 || Machine == ARM64; }
llvm::COFF::MachineTypes Machine = IMAGE_FILE_MACHINE_UNKNOWN; llvm::COFF::MachineTypes Machine = IMAGE_FILE_MACHINE_UNKNOWN;
bool Verbose = false; bool Verbose = false;
WindowsSubsystem Subsystem = llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN; WindowsSubsystem Subsystem = llvm::COFF::IMAGE_SUBSYSTEM_UNKNOWN;
SymbolBody *Entry = nullptr; SymbolBody *Entry = nullptr;
bool NoEntry = false; bool NoEntry = false;
std::string OutputFile; std::string OutputFile;
bool ColorDiagnostics; bool ColorDiagnostics;
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines

lld/trunk/COFF/DriverUtils.cpp

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines
} // anonymous namespace } // anonymous namespace
// Returns /machine's value. // Returns /machine's value.
MachineTypes getMachineType(StringRef S) { MachineTypes getMachineType(StringRef S) {
MachineTypes MT = StringSwitch<MachineTypes>(S.lower()) MachineTypes MT = StringSwitch<MachineTypes>(S.lower())
.Cases("x64", "amd64", AMD64) .Cases("x64", "amd64", AMD64)
.Cases("x86", "i386", I386) .Cases("x86", "i386", I386)
.Case("arm", ARMNT) .Case("arm", ARMNT)
.Case("arm64", ARM64)
.Default(IMAGE_FILE_MACHINE_UNKNOWN); .Default(IMAGE_FILE_MACHINE_UNKNOWN);
if (MT != IMAGE_FILE_MACHINE_UNKNOWN) if (MT != IMAGE_FILE_MACHINE_UNKNOWN)
return MT; return MT;
fatal("unknown /machine argument: " + S); fatal("unknown /machine argument: " + S);
} }
StringRef machineToStr(MachineTypes MT) { StringRef machineToStr(MachineTypes MT) {
switch (MT) { switch (MT) {
case ARMNT: case ARMNT:
return "arm"; return "arm";
case ARM64:
return "arm64";
case AMD64: case AMD64:
return "x64"; return "x64";
case I386: case I386:
return "x86"; return "x86";
default: default:
llvm_unreachable("unknown machine type"); llvm_unreachable("unknown machine type");
} }
} }
▲ Show 20 Lines • Show All 624 Lines • Show Last 20 Lines

lld/trunk/COFF/InputFiles.cpp

Show First 20 Lines • Show All 374 Lines • ▼ Show 20 Lines
MachineTypes BitcodeFile::getMachineType() { MachineTypes BitcodeFile::getMachineType() {
switch (Triple(Obj->getTargetTriple()).getArch()) { switch (Triple(Obj->getTargetTriple()).getArch()) {
case Triple::x86_64: case Triple::x86_64:
return AMD64; return AMD64;
case Triple::x86: case Triple::x86:
return I386; return I386;
case Triple::arm: case Triple::arm:
return ARMNT; return ARMNT;
case Triple::aarch64:
return ARM64;
default: default:
return IMAGE_FILE_MACHINE_UNKNOWN; return IMAGE_FILE_MACHINE_UNKNOWN;
} }
} }
} // namespace coff } // namespace coff
} // namespace lld } // namespace lld
// Returns the last element of a path, which is supposed to be a filename. // Returns the last element of a path, which is supposed to be a filename.
Show All 19 Lines

lld/trunk/test/COFF/arm64-magic.yaml

# RUN: yaml2obj < %s > %t.obj
# RUN: lld-link /out:%t.exe /entry:mainCRTStartup /subsystem:console %t.obj
# RUN: llvm-readobj -file-headers %t.exe | FileCheck %s
# CHECK: Format: COFF-ARM64
# CHECK: Arch: aarch64
# CHECK: AddressSize: 64bit
# CHECK: ImageFileHeader {
# CHECK: Machine: IMAGE_FILE_MACHINE_ARM64 (0xAA64)
# CHECK: Characteristics [ (0x22)
# CHECK: IMAGE_FILE_EXECUTABLE_IMAGE (0x2)
# CHECK: IMAGE_FILE_LARGE_ADDRESS_AWARE (0x20)
# CHECK: ]
# CHECK: }
# CHECK: ImageOptionalHeader {
# CHECK: Magic: 0x20B
--- !COFF
header:
Machine: IMAGE_FILE_MACHINE_ARM64
Characteristics: []
sections:
- Name: .text
Characteristics: [ IMAGE_SCN_CNT_CODE, IMAGE_SCN_MEM_PURGEABLE, IMAGE_SCN_MEM_EXECUTE, IMAGE_SCN_MEM_READ ]
Alignment: 4
SectionData: 'e0031f2ac0035fd6'
symbols:
- Name: .text
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_NULL
StorageClass: IMAGE_SYM_CLASS_STATIC
SectionDefinition:
Length: 8
NumberOfRelocations: 0
NumberOfLinenumbers: 0
CheckSum: 0
Number: 1
- Name: mainCRTStartup
Value: 0
SectionNumber: 1
SimpleType: IMAGE_SYM_TYPE_NULL
ComplexType: IMAGE_SYM_DTYPE_FUNCTION
StorageClass: IMAGE_SYM_CLASS_EXTERNAL
...