mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-12-05 10:17:36 +00:00
[AArch64] Emit the correct MCExpr relocations specifiers like VK_ABS_G0, etc
Summary: D55896 and D56029 add support to emit fixups for :abs_g0: , :abs_g1_s: , etc. This patch adds the necessary enums and MCExpr needed for lowering these. Reviewers: rnk, mstorsjo, efriedma Reviewed By: efriedma Subscribers: javed.absar, kristof.beyls, llvm-commits Differential Revision: https://reviews.llvm.org/D56037 llvm-svn: 350798
This commit is contained in:
parent
0c1e9f83bc
commit
9bf821bd2f
@ -4751,7 +4751,8 @@ AArch64InstrInfo::getSerializableBitmaskMachineOperandTargetFlags() const {
|
||||
static const std::pair<unsigned, const char *> TargetFlags[] = {
|
||||
{MO_COFFSTUB, "aarch64-coffstub"},
|
||||
{MO_GOT, "aarch64-got"}, {MO_NC, "aarch64-nc"},
|
||||
{MO_TLS, "aarch64-tls"}, {MO_DLLIMPORT, "aarch64-dllimport"}};
|
||||
{MO_S, "aarch64-s"}, {MO_TLS, "aarch64-tls"},
|
||||
{MO_DLLIMPORT, "aarch64-dllimport"}};
|
||||
return makeArrayRef(TargetFlags);
|
||||
}
|
||||
|
||||
|
@ -189,20 +189,51 @@ MCOperand AArch64MCInstLower::lowerSymbolOperandELF(const MachineOperand &MO,
|
||||
|
||||
MCOperand AArch64MCInstLower::lowerSymbolOperandCOFF(const MachineOperand &MO,
|
||||
MCSymbol *Sym) const {
|
||||
AArch64MCExpr::VariantKind RefKind = AArch64MCExpr::VK_NONE;
|
||||
uint32_t RefFlags = 0;
|
||||
|
||||
if (MO.getTargetFlags() & AArch64II::MO_TLS) {
|
||||
if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) == AArch64II::MO_PAGEOFF)
|
||||
RefKind = AArch64MCExpr::VK_SECREL_LO12;
|
||||
RefFlags |= AArch64MCExpr::VK_SECREL_LO12;
|
||||
else if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) ==
|
||||
AArch64II::MO_HI12)
|
||||
RefKind = AArch64MCExpr::VK_SECREL_HI12;
|
||||
RefFlags |= AArch64MCExpr::VK_SECREL_HI12;
|
||||
|
||||
} else if (MO.getTargetFlags() & AArch64II::MO_S) {
|
||||
RefFlags |= AArch64MCExpr::VK_SABS;
|
||||
} else {
|
||||
RefFlags |= AArch64MCExpr::VK_ABS;
|
||||
}
|
||||
|
||||
if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) == AArch64II::MO_G3)
|
||||
RefFlags |= AArch64MCExpr::VK_G3;
|
||||
else if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) == AArch64II::MO_G2)
|
||||
RefFlags |= AArch64MCExpr::VK_G2;
|
||||
else if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) == AArch64II::MO_G1)
|
||||
RefFlags |= AArch64MCExpr::VK_G1;
|
||||
else if ((MO.getTargetFlags() & AArch64II::MO_FRAGMENT) == AArch64II::MO_G0)
|
||||
RefFlags |= AArch64MCExpr::VK_G0;
|
||||
|
||||
// FIXME: Currently we only set VK_NC for MO_G3/MO_G2/MO_G1/MO_G0. This is
|
||||
// because setting VK_NC for others would mean setting their respective
|
||||
// RefFlags correctly. We should do this in a separate patch.
|
||||
if (MO.getTargetFlags() & AArch64II::MO_NC) {
|
||||
auto MOFrag = (MO.getTargetFlags() & AArch64II::MO_FRAGMENT);
|
||||
if (MOFrag == AArch64II::MO_G3 || MOFrag == AArch64II::MO_G2 ||
|
||||
MOFrag == AArch64II::MO_G1 || MOFrag == AArch64II::MO_G0)
|
||||
RefFlags |= AArch64MCExpr::VK_NC;
|
||||
}
|
||||
|
||||
const MCExpr *Expr =
|
||||
MCSymbolRefExpr::create(Sym, MCSymbolRefExpr::VK_None, Ctx);
|
||||
if (!MO.isJTI() && MO.getOffset())
|
||||
Expr = MCBinaryExpr::createAdd(
|
||||
Expr, MCConstantExpr::create(MO.getOffset(), Ctx), Ctx);
|
||||
|
||||
auto RefKind = static_cast<AArch64MCExpr::VariantKind>(RefFlags);
|
||||
assert(RefKind != AArch64MCExpr::VK_INVALID &&
|
||||
"Invalid relocation requested");
|
||||
Expr = AArch64MCExpr::create(Expr, RefKind, Ctx);
|
||||
|
||||
return MCOperand::createExpr(Expr);
|
||||
}
|
||||
|
||||
|
@ -581,6 +581,10 @@ namespace AArch64II {
|
||||
/// to the symbol is for an import stub. This is used for DLL import
|
||||
/// storage class indication on Windows.
|
||||
MO_DLLIMPORT = 0x80,
|
||||
|
||||
/// MO_S - Indicates that the bits of the symbol operand represented by
|
||||
/// MO_G0 etc are signed.
|
||||
MO_S = 0x100,
|
||||
};
|
||||
} // end namespace AArch64II
|
||||
|
||||
|
21
test/CodeGen/AArch64/reloc-specifiers.mir
Normal file
21
test/CodeGen/AArch64/reloc-specifiers.mir
Normal file
@ -0,0 +1,21 @@
|
||||
# RUN: llc -mtriple=arm64-windows -start-after=prologepilog -show-mc-encoding \
|
||||
# RUN: -o - %s | FileCheck %s
|
||||
|
||||
--- |
|
||||
define void @bar() { ret void }
|
||||
...
|
||||
|
||||
---
|
||||
name: bar
|
||||
body: |
|
||||
bb.0:
|
||||
; CHECK-LABEL: bar
|
||||
|
||||
; CHECK: movz x0, #:abs_g1_s:.Lfoo$frame_escape_0 ; encoding: [0bAAA00000,A,0b101AAAAA,0xd2]
|
||||
; CHECK: fixup A - offset: 0, value: :abs_g1_s:.Lfoo$frame_escape_0, kind: fixup_aarch64_movw
|
||||
renamable $x0 = MOVZXi target-flags(aarch64-g1, aarch64-s) <mcsymbol .Lfoo$frame_escape_0>, 16
|
||||
|
||||
; CHECK: movk x0, #:abs_g0_nc:.Lfoo$frame_escape_0 ; encoding: [0bAAA00000,A,0b100AAAAA,0xf2]
|
||||
; CHECK: fixup A - offset: 0, value: :abs_g0_nc:.Lfoo$frame_escape_0, kind: fixup_aarch64_movw
|
||||
renamable $x0 = MOVKXi $x0, target-flags(aarch64-g0, aarch64-nc) <mcsymbol .Lfoo$frame_escape_0>, 0
|
||||
...
|
Loading…
Reference in New Issue
Block a user