[llvm] a4976ca - Move Hexagon-specific MCSymbolRefExpr::VariantKind to HexagonMCExpr
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 14 21:26:04 PDT 2025
Author: Fangrui Song
Date: 2025-03-14T21:25:58-07:00
New Revision: a4976ca6749800765048d75a4868255403c96d2b
URL: https://github.com/llvm/llvm-project/commit/a4976ca6749800765048d75a4868255403c96d2b
DIFF: https://github.com/llvm/llvm-project/commit/a4976ca6749800765048d75a4868255403c96d2b.diff
LOG: Move Hexagon-specific MCSymbolRefExpr::VariantKind to HexagonMCExpr
In the future, should try storing the relocation operator in
MCTargetExpr and refactor the ELF writer to use MCValue::RefKind,
similar to AArch64MCExpr.
Also add a MCSymbolRefExpr::create overload that takes an uint16_t
argument to help port code.
Added:
Modified:
llvm/include/llvm/MC/MCExpr.h
llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp
llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h
Removed:
################################################################################
diff --git a/llvm/include/llvm/MC/MCExpr.h b/llvm/include/llvm/MC/MCExpr.h
index 7d01f6e9c48e2..6186e472a8c52 100644
--- a/llvm/include/llvm/MC/MCExpr.h
+++ b/llvm/include/llvm/MC/MCExpr.h
@@ -249,16 +249,6 @@ class MCSymbolRefExpr : public MCExpr {
VK_COFF_IMGREL32, // symbol at imgrel (image-relative)
- VK_Hexagon_LO16,
- VK_Hexagon_HI16,
- VK_Hexagon_GPREL,
- VK_Hexagon_GD_GOT,
- VK_Hexagon_LD_GOT,
- VK_Hexagon_GD_PLT,
- VK_Hexagon_LD_PLT,
- VK_Hexagon_IE,
- VK_Hexagon_IE_GOT,
-
VK_WASM_TYPEINDEX, // Reference to a symbol's type (signature)
VK_WASM_TLSREL, // Memory address relative to __tls_base
VK_WASM_MBREL, // Memory address relative to __memory_base
@@ -310,6 +300,10 @@ class MCSymbolRefExpr : public MCExpr {
static const MCSymbolRefExpr *create(const MCSymbol *Symbol, VariantKind Kind,
MCContext &Ctx, SMLoc Loc = SMLoc());
+ static const MCSymbolRefExpr *create(const MCSymbol *Symbol, uint16_t Kind,
+ MCContext &Ctx, SMLoc Loc = SMLoc()) {
+ return MCSymbolRefExpr::create(Symbol, VariantKind(Kind), Ctx, Loc);
+ }
/// @}
/// \name Accessors
diff --git a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
index f8c57fc5e0058..d4df5908bec0e 100644
--- a/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
+++ b/llvm/lib/Target/Hexagon/AsmParser/HexagonAsmParser.cpp
@@ -1249,9 +1249,9 @@ bool HexagonAsmParser::parseInstruction(OperandVector &Operands) {
MCValue Value;
if (Expr->evaluateAsRelocatable(Value, nullptr, nullptr)) {
if (!Value.isAbsolute()) {
- switch (Value.getAccessVariant()) {
- case MCSymbolRefExpr::VariantKind::VK_TPREL:
- case MCSymbolRefExpr::VariantKind::VK_DTPREL:
+ switch (HexagonMCExpr::VariantKind(Value.getAccessVariant())) {
+ case HexagonMCExpr::VK_TPREL:
+ case HexagonMCExpr::VK_DTPREL:
// Don't lazy extend these expression variants
MustNotExtend = !MustExtend;
break;
diff --git a/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp b/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp
index b3b355677436d..845e60bf1a2a1 100644
--- a/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonMCInstLower.cpp
@@ -44,40 +44,40 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol,
// Populate the relocation type based on Hexagon target flags
// set on an operand
- MCSymbolRefExpr::VariantKind RelocationType;
+ HexagonMCExpr::VariantKind RelocationType;
switch (MO.getTargetFlags() & ~HexagonII::HMOTF_ConstExtended) {
default:
- RelocationType = MCSymbolRefExpr::VK_None;
+ RelocationType = HexagonMCExpr::VK_None;
break;
case HexagonII::MO_PCREL:
- RelocationType = MCSymbolRefExpr::VK_PCREL;
+ RelocationType = HexagonMCExpr::VK_PCREL;
break;
case HexagonII::MO_GOT:
- RelocationType = MCSymbolRefExpr::VK_GOT;
+ RelocationType = HexagonMCExpr::VK_GOT;
break;
case HexagonII::MO_LO16:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_LO16;
+ RelocationType = HexagonMCExpr::VK_LO16;
break;
case HexagonII::MO_HI16:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_HI16;
+ RelocationType = HexagonMCExpr::VK_HI16;
break;
case HexagonII::MO_GPREL:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_GPREL;
+ RelocationType = HexagonMCExpr::VK_GPREL;
break;
case HexagonII::MO_GDGOT:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_GD_GOT;
+ RelocationType = HexagonMCExpr::VK_GD_GOT;
break;
case HexagonII::MO_GDPLT:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_GD_PLT;
+ RelocationType = HexagonMCExpr::VK_GD_PLT;
break;
case HexagonII::MO_IE:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_IE;
+ RelocationType = HexagonMCExpr::VK_IE;
break;
case HexagonII::MO_IEGOT:
- RelocationType = MCSymbolRefExpr::VK_Hexagon_IE_GOT;
+ RelocationType = HexagonMCExpr::VK_IE_GOT;
break;
case HexagonII::MO_TPREL:
- RelocationType = MCSymbolRefExpr::VK_TPREL;
+ RelocationType = HexagonMCExpr::VK_TPREL;
break;
}
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
index 27f0453ba89eb..84fb0b8db5101 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonELFObjectWriter.cpp
@@ -7,6 +7,7 @@
//===----------------------------------------------------------------------===//
#include "MCTargetDesc/HexagonFixupKinds.h"
+#include "MCTargetDesc/HexagonMCExpr.h"
#include "MCTargetDesc/HexagonMCTargetDesc.h"
#include "llvm/MC/MCAssembler.h"
#include "llvm/MC/MCELFObjectWriter.h"
@@ -41,32 +42,32 @@ unsigned HexagonELFObjectWriter::getRelocType(MCContext &Ctx,
MCValue const &Target,
MCFixup const &Fixup,
bool IsPCRel) const {
- MCSymbolRefExpr::VariantKind Variant = Target.getAccessVariant();
+ auto Variant = HexagonMCExpr::VariantKind(Target.getAccessVariant());
switch (Fixup.getTargetKind()) {
default:
report_fatal_error("Unrecognized relocation type");
break;
case FK_Data_4:
- switch(Variant) {
- case MCSymbolRefExpr::VariantKind::VK_DTPREL:
+ switch (Variant) {
+ case HexagonMCExpr::VK_DTPREL:
return ELF::R_HEX_DTPREL_32;
- case MCSymbolRefExpr::VariantKind::VK_GOT:
+ case HexagonMCExpr::VK_GOT:
return ELF::R_HEX_GOT_32;
- case MCSymbolRefExpr::VariantKind::VK_GOTREL:
+ case HexagonMCExpr::VK_GOTREL:
return ELF::R_HEX_GOTREL_32;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_GD_GOT:
+ case HexagonMCExpr::VK_GD_GOT:
return ELF::R_HEX_GD_GOT_32;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_IE:
+ case HexagonMCExpr::VK_IE:
return ELF::R_HEX_IE_32;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_IE_GOT:
+ case HexagonMCExpr::VK_IE_GOT:
return ELF::R_HEX_IE_GOT_32;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_LD_GOT:
+ case HexagonMCExpr::VK_LD_GOT:
return ELF::R_HEX_LD_GOT_32;
- case MCSymbolRefExpr::VariantKind::VK_PCREL:
+ case HexagonMCExpr::VK_PCREL:
return ELF::R_HEX_32_PCREL;
- case MCSymbolRefExpr::VariantKind::VK_TPREL:
+ case HexagonMCExpr::VK_TPREL:
return ELF::R_HEX_TPREL_32;
- case MCSymbolRefExpr::VariantKind::VK_None:
+ case HexagonMCExpr::VK_None:
return IsPCRel ? ELF::R_HEX_32_PCREL : ELF::R_HEX_32;
default:
report_fatal_error("Unrecognized variant type");
@@ -75,19 +76,19 @@ unsigned HexagonELFObjectWriter::getRelocType(MCContext &Ctx,
return ELF::R_HEX_32_PCREL;
case FK_Data_2:
switch(Variant) {
- case MCSymbolRefExpr::VariantKind::VK_DTPREL:
+ case HexagonMCExpr::VK_DTPREL:
return ELF::R_HEX_DTPREL_16;
- case MCSymbolRefExpr::VariantKind::VK_GOT:
+ case HexagonMCExpr::VK_GOT:
return ELF::R_HEX_GOT_16;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_GD_GOT:
+ case HexagonMCExpr::VK_GD_GOT:
return ELF::R_HEX_GD_GOT_16;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_IE_GOT:
+ case HexagonMCExpr::VK_IE_GOT:
return ELF::R_HEX_IE_GOT_16;
- case MCSymbolRefExpr::VariantKind::VK_Hexagon_LD_GOT:
+ case HexagonMCExpr::VK_LD_GOT:
return ELF::R_HEX_LD_GOT_16;
- case MCSymbolRefExpr::VariantKind::VK_TPREL:
+ case HexagonMCExpr::VK_TPREL:
return ELF::R_HEX_TPREL_16;
- case MCSymbolRefExpr::VariantKind::VK_None:
+ case HexagonMCExpr::VK_None:
return ELF::R_HEX_16;
default:
report_fatal_error("Unrecognized variant type");
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
index 6cf4ceb3de927..7675b05f106a0 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCAsmInfo.cpp
@@ -11,23 +11,18 @@
//===----------------------------------------------------------------------===//
#include "HexagonMCAsmInfo.h"
+#include "MCTargetDesc/HexagonMCExpr.h"
#include "llvm/MC/MCExpr.h"
using namespace llvm;
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
- {MCSymbolRefExpr::VK_DTPREL, "DTPREL"},
- {MCSymbolRefExpr::VK_Hexagon_GD_GOT, "GDGOT"},
- {MCSymbolRefExpr::VK_Hexagon_GD_PLT, "GDPLT"},
- {MCSymbolRefExpr::VK_GOT, "GOT"},
- {MCSymbolRefExpr::VK_GOTREL, "GOTREL"},
- {MCSymbolRefExpr::VK_Hexagon_IE, "IE"},
- {MCSymbolRefExpr::VK_Hexagon_IE_GOT, "IEGOT"},
- {MCSymbolRefExpr::VK_Hexagon_LD_GOT, "LDGOT"},
- {MCSymbolRefExpr::VK_Hexagon_LD_PLT, "LDPLT"},
- {MCSymbolRefExpr::VK_PCREL, "PCREL"},
- {MCSymbolRefExpr::VK_PLT, "PLT"},
- {MCSymbolRefExpr::VK_TPREL, "TPREL"},
+ {HexagonMCExpr::VK_DTPREL, "DTPREL"}, {HexagonMCExpr::VK_GD_GOT, "GDGOT"},
+ {HexagonMCExpr::VK_GD_PLT, "GDPLT"}, {HexagonMCExpr::VK_GOT, "GOT"},
+ {HexagonMCExpr::VK_GOTREL, "GOTREL"}, {HexagonMCExpr::VK_IE, "IE"},
+ {HexagonMCExpr::VK_IE_GOT, "IEGOT"}, {HexagonMCExpr::VK_LD_GOT, "LDGOT"},
+ {HexagonMCExpr::VK_LD_PLT, "LDPLT"}, {HexagonMCExpr::VK_PCREL, "PCREL"},
+ {HexagonMCExpr::VK_PLT, "PLT"}, {HexagonMCExpr::VK_TPREL, "TPREL"},
};
// Pin the vtable to this file.
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
index 2e4fe939146b8..9211671bb630c 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.cpp
@@ -43,10 +43,11 @@ STATISTIC(MCNumEmitted, "Number of MC instructions emitted");
static const unsigned fixup_Invalid = ~0u;
+// clang-format off
#define _ fixup_Invalid
#define P(x) Hexagon::fixup_Hexagon##x
static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
- { MCSymbolRefExpr::VK_DTPREL,
+ { HexagonMCExpr::VK_DTPREL,
{ _, _, _, _,
_, _, P(_DTPREL_16_X), P(_DTPREL_11_X),
P(_DTPREL_11_X), P(_9_X), _, P(_DTPREL_11_X),
@@ -56,7 +57,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_DTPREL_32_6_X) }},
- { MCSymbolRefExpr::VK_GOT,
+ { HexagonMCExpr::VK_GOT,
{ _, _, _, _,
_, _, P(_GOT_11_X), _ /* [1] */,
_ /* [1] */, P(_9_X), _, P(_GOT_11_X),
@@ -66,7 +67,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_GOT_32_6_X) }},
- { MCSymbolRefExpr::VK_GOTREL,
+ { HexagonMCExpr::VK_GOTREL,
{ _, _, _, _,
_, _, P(_GOTREL_11_X), P(_GOTREL_11_X),
P(_GOTREL_11_X), P(_9_X), _, P(_GOTREL_11_X),
@@ -76,7 +77,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_GOTREL_32_6_X) }},
- { MCSymbolRefExpr::VK_TPREL,
+ { HexagonMCExpr::VK_TPREL,
{ _, _, _, _,
_, _, P(_TPREL_16_X), P(_TPREL_11_X),
P(_TPREL_11_X), P(_9_X), _, P(_TPREL_11_X),
@@ -86,7 +87,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_TPREL_32_6_X) }},
- { MCSymbolRefExpr::VK_Hexagon_GD_GOT,
+ { HexagonMCExpr::VK_GD_GOT,
{ _, _, _, _,
_, _, P(_GD_GOT_16_X), P(_GD_GOT_11_X),
P(_GD_GOT_11_X), P(_9_X), _, P(_GD_GOT_11_X),
@@ -96,7 +97,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_GD_GOT_32_6_X) }},
- { MCSymbolRefExpr::VK_Hexagon_GD_PLT,
+ { HexagonMCExpr::VK_GD_PLT,
{ _, _, _, _,
_, _, _, _,
_, P(_9_X), _, P(_GD_PLT_B22_PCREL_X),
@@ -106,7 +107,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_Hexagon_IE,
+ { HexagonMCExpr::VK_IE,
{ _, _, _, _,
_, _, P(_IE_16_X), _,
_, P(_9_X), _, _,
@@ -116,7 +117,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_IE_32_6_X) }},
- { MCSymbolRefExpr::VK_Hexagon_IE_GOT,
+ { HexagonMCExpr::VK_IE_GOT,
{ _, _, _, _,
_, _, P(_IE_GOT_11_X), P(_IE_GOT_11_X),
P(_IE_GOT_11_X), P(_9_X), _, P(_IE_GOT_11_X),
@@ -126,7 +127,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_IE_GOT_32_6_X) }},
- { MCSymbolRefExpr::VK_Hexagon_LD_GOT,
+ { HexagonMCExpr::VK_LD_GOT,
{ _, _, _, _,
_, _, P(_LD_GOT_11_X), P(_LD_GOT_11_X),
P(_LD_GOT_11_X), P(_9_X), _, P(_LD_GOT_11_X),
@@ -136,7 +137,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_LD_GOT_32_6_X) }},
- { MCSymbolRefExpr::VK_Hexagon_LD_PLT,
+ { HexagonMCExpr::VK_LD_PLT,
{ _, _, _, _,
_, _, _, _,
_, P(_9_X), _, P(_LD_PLT_B22_PCREL_X),
@@ -146,7 +147,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_PCREL,
+ { HexagonMCExpr::VK_PCREL,
{ _, _, _, _,
_, _, P(_6_PCREL_X), _,
_, P(_9_X), _, _,
@@ -156,7 +157,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
_, _, _, _,
_, _, _, _,
P(_32_PCREL) }},
- { MCSymbolRefExpr::VK_None,
+ { HexagonMCExpr::VK_None,
{ _, _, _, _,
_, _, P(_6_X), P(_8_X),
P(_8_X), P(_9_X), P(_10_X), P(_11_X),
@@ -170,7 +171,7 @@ static const std::map<unsigned, std::vector<unsigned>> ExtFixups = {
// [1] The fixup is GOT_16_X for signed values and GOT_11_X for unsigned.
static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
- { MCSymbolRefExpr::VK_DTPREL,
+ { HexagonMCExpr::VK_DTPREL,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -180,7 +181,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_DTPREL_32) }},
- { MCSymbolRefExpr::VK_GOT,
+ { HexagonMCExpr::VK_GOT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -190,7 +191,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_GOT_32) }},
- { MCSymbolRefExpr::VK_GOTREL,
+ { HexagonMCExpr::VK_GOTREL,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -200,7 +201,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_GOTREL_32) }},
- { MCSymbolRefExpr::VK_PLT,
+ { HexagonMCExpr::VK_PLT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -210,7 +211,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_TPREL,
+ { HexagonMCExpr::VK_TPREL,
{ _, _, _, _,
_, _, _, _,
_, _, _, P(_TPREL_11_X),
@@ -220,7 +221,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_TPREL_32) }},
- { MCSymbolRefExpr::VK_Hexagon_GD_GOT,
+ { HexagonMCExpr::VK_GD_GOT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -230,7 +231,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_GD_GOT_32) }},
- { MCSymbolRefExpr::VK_Hexagon_GD_PLT,
+ { HexagonMCExpr::VK_GD_PLT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -240,7 +241,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_Hexagon_GPREL,
+ { HexagonMCExpr::VK_GPREL,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -250,7 +251,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_Hexagon_HI16,
+ { HexagonMCExpr::VK_HI16,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -260,7 +261,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_Hexagon_IE,
+ { HexagonMCExpr::VK_IE,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -270,7 +271,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_IE_32) }},
- { MCSymbolRefExpr::VK_Hexagon_IE_GOT,
+ { HexagonMCExpr::VK_IE_GOT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -280,7 +281,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_IE_GOT_32) }},
- { MCSymbolRefExpr::VK_Hexagon_LD_GOT,
+ { HexagonMCExpr::VK_LD_GOT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -290,7 +291,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_LD_GOT_32) }},
- { MCSymbolRefExpr::VK_Hexagon_LD_PLT,
+ { HexagonMCExpr::VK_LD_PLT,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -300,7 +301,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_Hexagon_LO16,
+ { HexagonMCExpr::VK_LO16,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -310,7 +311,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
_ }},
- { MCSymbolRefExpr::VK_PCREL,
+ { HexagonMCExpr::VK_PCREL,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -320,7 +321,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
_, _, _, _,
P(_32_PCREL) }},
- { MCSymbolRefExpr::VK_None,
+ { HexagonMCExpr::VK_None,
{ _, _, _, _,
_, _, _, _,
_, _, _, _,
@@ -331,7 +332,7 @@ static const std::map<unsigned, std::vector<unsigned>> StdFixups = {
_, _, _, _,
P(_32) }},
};
-//
+// clang-format on
// [2] The actual fixup is LO16 or HI16, depending on the instruction.
#undef P
#undef _
@@ -456,15 +457,16 @@ void HexagonMCCodeEmitter::encodeSingleInstruction(
/// Some insns are not extended and thus have no bits. These cases require
/// a more brute force method for determining the correct relocation.
-Hexagon::Fixups HexagonMCCodeEmitter::getFixupNoBits(
- MCInstrInfo const &MCII, const MCInst &MI, const MCOperand &MO,
- const MCSymbolRefExpr::VariantKind VarKind) const {
+Hexagon::Fixups
+HexagonMCCodeEmitter::getFixupNoBits(MCInstrInfo const &MCII, const MCInst &MI,
+ const MCOperand &MO,
+ HexagonMCExpr::VariantKind VarKind) const {
const MCInstrDesc &MCID = HexagonMCInstrInfo::getDesc(MCII, MI);
unsigned InsnType = HexagonMCInstrInfo::getType(MCII, MI);
using namespace Hexagon;
if (InsnType == HexagonII::TypeEXTENDER) {
- if (VarKind == MCSymbolRefExpr::VK_None) {
+ if (VarKind == HexagonMCExpr::VK_None) {
auto Instrs = HexagonMCInstrInfo::bundleInstructions(*State.Bundle);
for (auto I = Instrs.begin(), N = Instrs.end(); I != N; ++I) {
if (I->getInst() != &MI)
@@ -479,18 +481,18 @@ Hexagon::Fixups HexagonMCCodeEmitter::getFixupNoBits(
}
}
- static const std::map<unsigned,unsigned> Relocs = {
- { MCSymbolRefExpr::VK_GOTREL, fixup_Hexagon_GOTREL_32_6_X },
- { MCSymbolRefExpr::VK_GOT, fixup_Hexagon_GOT_32_6_X },
- { MCSymbolRefExpr::VK_TPREL, fixup_Hexagon_TPREL_32_6_X },
- { MCSymbolRefExpr::VK_DTPREL, fixup_Hexagon_DTPREL_32_6_X },
- { MCSymbolRefExpr::VK_Hexagon_GD_GOT, fixup_Hexagon_GD_GOT_32_6_X },
- { MCSymbolRefExpr::VK_Hexagon_LD_GOT, fixup_Hexagon_LD_GOT_32_6_X },
- { MCSymbolRefExpr::VK_Hexagon_IE, fixup_Hexagon_IE_32_6_X },
- { MCSymbolRefExpr::VK_Hexagon_IE_GOT, fixup_Hexagon_IE_GOT_32_6_X },
- { MCSymbolRefExpr::VK_PCREL, fixup_Hexagon_B32_PCREL_X },
- { MCSymbolRefExpr::VK_Hexagon_GD_PLT, fixup_Hexagon_GD_PLT_B32_PCREL_X },
- { MCSymbolRefExpr::VK_Hexagon_LD_PLT, fixup_Hexagon_LD_PLT_B32_PCREL_X },
+ static const std::map<unsigned, unsigned> Relocs = {
+ {HexagonMCExpr::VK_GOTREL, fixup_Hexagon_GOTREL_32_6_X},
+ {HexagonMCExpr::VK_GOT, fixup_Hexagon_GOT_32_6_X},
+ {HexagonMCExpr::VK_TPREL, fixup_Hexagon_TPREL_32_6_X},
+ {HexagonMCExpr::VK_DTPREL, fixup_Hexagon_DTPREL_32_6_X},
+ {HexagonMCExpr::VK_GD_GOT, fixup_Hexagon_GD_GOT_32_6_X},
+ {HexagonMCExpr::VK_LD_GOT, fixup_Hexagon_LD_GOT_32_6_X},
+ {HexagonMCExpr::VK_IE, fixup_Hexagon_IE_32_6_X},
+ {HexagonMCExpr::VK_IE_GOT, fixup_Hexagon_IE_GOT_32_6_X},
+ {HexagonMCExpr::VK_PCREL, fixup_Hexagon_B32_PCREL_X},
+ {HexagonMCExpr::VK_GD_PLT, fixup_Hexagon_GD_PLT_B32_PCREL_X},
+ {HexagonMCExpr::VK_LD_PLT, fixup_Hexagon_LD_PLT_B32_PCREL_X},
};
auto F = Relocs.find(VarKind);
@@ -502,28 +504,28 @@ Hexagon::Fixups HexagonMCCodeEmitter::getFixupNoBits(
if (MCID.isBranch())
return fixup_Hexagon_B13_PCREL;
- static const std::map<unsigned,unsigned> RelocsLo = {
- { MCSymbolRefExpr::VK_GOT, fixup_Hexagon_GOT_LO16 },
- { MCSymbolRefExpr::VK_GOTREL, fixup_Hexagon_GOTREL_LO16 },
- { MCSymbolRefExpr::VK_Hexagon_GD_GOT, fixup_Hexagon_GD_GOT_LO16 },
- { MCSymbolRefExpr::VK_Hexagon_LD_GOT, fixup_Hexagon_LD_GOT_LO16 },
- { MCSymbolRefExpr::VK_Hexagon_IE, fixup_Hexagon_IE_LO16 },
- { MCSymbolRefExpr::VK_Hexagon_IE_GOT, fixup_Hexagon_IE_GOT_LO16 },
- { MCSymbolRefExpr::VK_TPREL, fixup_Hexagon_TPREL_LO16 },
- { MCSymbolRefExpr::VK_DTPREL, fixup_Hexagon_DTPREL_LO16 },
- { MCSymbolRefExpr::VK_None, fixup_Hexagon_LO16 },
+ static const std::map<unsigned, unsigned> RelocsLo = {
+ {HexagonMCExpr::VK_GOT, fixup_Hexagon_GOT_LO16},
+ {HexagonMCExpr::VK_GOTREL, fixup_Hexagon_GOTREL_LO16},
+ {HexagonMCExpr::VK_GD_GOT, fixup_Hexagon_GD_GOT_LO16},
+ {HexagonMCExpr::VK_LD_GOT, fixup_Hexagon_LD_GOT_LO16},
+ {HexagonMCExpr::VK_IE, fixup_Hexagon_IE_LO16},
+ {HexagonMCExpr::VK_IE_GOT, fixup_Hexagon_IE_GOT_LO16},
+ {HexagonMCExpr::VK_TPREL, fixup_Hexagon_TPREL_LO16},
+ {HexagonMCExpr::VK_DTPREL, fixup_Hexagon_DTPREL_LO16},
+ {HexagonMCExpr::VK_None, fixup_Hexagon_LO16},
};
- static const std::map<unsigned,unsigned> RelocsHi = {
- { MCSymbolRefExpr::VK_GOT, fixup_Hexagon_GOT_HI16 },
- { MCSymbolRefExpr::VK_GOTREL, fixup_Hexagon_GOTREL_HI16 },
- { MCSymbolRefExpr::VK_Hexagon_GD_GOT, fixup_Hexagon_GD_GOT_HI16 },
- { MCSymbolRefExpr::VK_Hexagon_LD_GOT, fixup_Hexagon_LD_GOT_HI16 },
- { MCSymbolRefExpr::VK_Hexagon_IE, fixup_Hexagon_IE_HI16 },
- { MCSymbolRefExpr::VK_Hexagon_IE_GOT, fixup_Hexagon_IE_GOT_HI16 },
- { MCSymbolRefExpr::VK_TPREL, fixup_Hexagon_TPREL_HI16 },
- { MCSymbolRefExpr::VK_DTPREL, fixup_Hexagon_DTPREL_HI16 },
- { MCSymbolRefExpr::VK_None, fixup_Hexagon_HI16 },
+ static const std::map<unsigned, unsigned> RelocsHi = {
+ {HexagonMCExpr::VK_GOT, fixup_Hexagon_GOT_HI16},
+ {HexagonMCExpr::VK_GOTREL, fixup_Hexagon_GOTREL_HI16},
+ {HexagonMCExpr::VK_GD_GOT, fixup_Hexagon_GD_GOT_HI16},
+ {HexagonMCExpr::VK_LD_GOT, fixup_Hexagon_LD_GOT_HI16},
+ {HexagonMCExpr::VK_IE, fixup_Hexagon_IE_HI16},
+ {HexagonMCExpr::VK_IE_GOT, fixup_Hexagon_IE_GOT_HI16},
+ {HexagonMCExpr::VK_TPREL, fixup_Hexagon_TPREL_HI16},
+ {HexagonMCExpr::VK_DTPREL, fixup_Hexagon_DTPREL_HI16},
+ {HexagonMCExpr::VK_None, fixup_Hexagon_HI16},
};
switch (MCID.getOpcode()) {
@@ -615,7 +617,7 @@ unsigned HexagonMCCodeEmitter::getExprOpValue(const MCInst &MI,
const MCInstrDesc &MCID = HexagonMCInstrInfo::getDesc(MCII, MI);
unsigned FixupWidth = HexagonMCInstrInfo::getExtentBits(MCII, MI) -
HexagonMCInstrInfo::getExtentAlignment(MCII, MI);
- MCSymbolRefExpr::VariantKind VarKind = MCSRE->getKind();
+ HexagonMCExpr::VariantKind VarKind = getVariantKind(MCSRE);
unsigned Opc = MCID.getOpcode();
unsigned IType = HexagonMCInstrInfo::getType(MCII, MI);
@@ -630,7 +632,7 @@ unsigned HexagonMCCodeEmitter::getExprOpValue(const MCInst &MI,
// Handle special cases first, the rest will be looked up in the tables.
if (FixupWidth == 16 && !State.Extended) {
- if (VarKind == MCSymbolRefExpr::VK_None) {
+ if (VarKind == HexagonMCExpr::VK_None) {
if (HexagonMCInstrInfo::s27_2_reloc(*MO.getExpr())) {
// A2_iconst.
FixupKind = Hexagon::fixup_Hexagon_27_REG;
@@ -648,7 +650,7 @@ unsigned HexagonMCCodeEmitter::getExprOpValue(const MCInst &MI,
if (UsesGP(MCID))
FixupKind = GPRelFixups[Shift];
}
- } else if (VarKind == MCSymbolRefExpr::VK_GOTREL) {
+ } else if (VarKind == HexagonMCExpr::VK_GOTREL) {
// Select between LO/HI.
if (Opc == Hexagon::LO)
FixupKind = Hexagon::fixup_Hexagon_GOTREL_LO16;
@@ -665,7 +667,7 @@ unsigned HexagonMCCodeEmitter::getExprOpValue(const MCInst &MI,
break;
case 8:
case 7:
- if (State.Extended && VarKind == MCSymbolRefExpr::VK_GOT)
+ if (State.Extended && VarKind == HexagonMCExpr::VK_GOT)
FixupKind = HexagonMCInstrInfo::isExtentSigned(MCII, MI)
? Hexagon::fixup_Hexagon_GOT_16_X
: Hexagon::fixup_Hexagon_GOT_11_X;
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h
index 10607f3bd3c52..c5e57d0df22a7 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCCodeEmitter.h
@@ -15,6 +15,7 @@
#define LLVM_LIB_TARGET_HEXAGON_MCTARGETDESC_HEXAGONMCCODEEMITTER_H
#include "MCTargetDesc/HexagonFixupKinds.h"
+#include "MCTargetDesc/HexagonMCExpr.h"
#include "llvm/MC/MCCodeEmitter.h"
#include "llvm/MC/MCExpr.h"
#include "llvm/TargetParser/SubtargetFeature.h"
@@ -77,7 +78,7 @@ class HexagonMCCodeEmitter : public MCCodeEmitter {
Hexagon::Fixups getFixupNoBits(MCInstrInfo const &MCII, const MCInst &MI,
const MCOperand &MO,
- const MCSymbolRefExpr::VariantKind Kind) const;
+ HexagonMCExpr::VariantKind Kind) const;
// Return parse bits for instruction `MCI' inside bundle `MCB'
uint32_t parseBits(size_t Last, MCInst const &MCB, MCInst const &MCI) const;
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp
index 598d1e8c50d39..409fcce3c8bb5 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.cpp
@@ -54,16 +54,16 @@ static void fixELFSymbolsInTLSFixupsImpl(const MCExpr *Expr, MCAssembler &Asm) {
}
case MCExpr::SymbolRef: {
const MCSymbolRefExpr &symRef = *cast<MCSymbolRefExpr>(Expr);
- switch (symRef.getKind()) {
+ switch (getVariantKind(&symRef)) {
default:
return;
- case MCSymbolRefExpr::VK_Hexagon_GD_GOT:
- case MCSymbolRefExpr::VK_Hexagon_LD_GOT:
- case MCSymbolRefExpr::VK_Hexagon_GD_PLT:
- case MCSymbolRefExpr::VK_Hexagon_LD_PLT:
- case MCSymbolRefExpr::VK_Hexagon_IE:
- case MCSymbolRefExpr::VK_Hexagon_IE_GOT:
- case MCSymbolRefExpr::VK_TPREL:
+ case HexagonMCExpr::VK_GD_GOT:
+ case HexagonMCExpr::VK_LD_GOT:
+ case HexagonMCExpr::VK_GD_PLT:
+ case HexagonMCExpr::VK_LD_PLT:
+ case HexagonMCExpr::VK_IE:
+ case HexagonMCExpr::VK_IE_GOT:
+ case HexagonMCExpr::VK_TPREL:
break;
}
cast<MCSymbolELF>(symRef.getSymbol()).setType(ELF::STT_TLS);
diff --git a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h
index eda96e23de317..a6fd3d37790f1 100644
--- a/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h
+++ b/llvm/lib/Target/Hexagon/MCTargetDesc/HexagonMCExpr.h
@@ -14,6 +14,29 @@
namespace llvm {
class HexagonMCExpr : public MCTargetExpr {
public:
+ enum VariantKind {
+ VK_None,
+
+ // While not strictly necessary, start at a larger number to avoid confusion
+ // with MCSymbolRefExpr::VariantKind.
+ VK_DTPREL = 100,
+ VK_GD_GOT,
+ VK_GD_PLT,
+ VK_GOT,
+ VK_GOTREL,
+ VK_IE,
+ VK_IE_GOT,
+ VK_LD_GOT,
+ VK_LD_PLT,
+ VK_PCREL,
+ VK_PLT,
+ VK_TPREL,
+
+ VK_LO16,
+ VK_HI16,
+ VK_GPREL,
+ };
+
static HexagonMCExpr *create(MCExpr const *Expr, MCContext &Ctx);
void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
bool evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
@@ -39,6 +62,11 @@ class HexagonMCExpr : public MCTargetExpr {
bool S27_2_reloc;
bool SignMismatch;
};
+
+static inline HexagonMCExpr::VariantKind
+getVariantKind(const MCSymbolRefExpr *SRE) {
+ return HexagonMCExpr::VariantKind(SRE->getKind());
+}
} // end namespace llvm
#endif // LLVM_LIB_TARGET_HEXAGON_HEXAGONMCEXPR_H
More information about the llvm-commits
mailing list