diff options
Diffstat (limited to 'llvm/lib/Target')
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64InstrInfo.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/AArch64/AArch64MCInstLower.cpp | 37 | ||||
| -rw-r--r-- | llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h | 4 |
3 files changed, 40 insertions, 4 deletions
diff --git a/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp b/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp index 26b514110fc..ada06788857 100644 --- a/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp +++ b/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp @@ -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); } diff --git a/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp b/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp index 07295989ec8..d71359223b1 100644 --- a/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp +++ b/llvm/lib/Target/AArch64/AArch64MCInstLower.cpp @@ -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); } diff --git a/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h b/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h index b8d0977ae54..44c6a6b4489 100644 --- a/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h +++ b/llvm/lib/Target/AArch64/Utils/AArch64BaseInfo.h @@ -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 |
