[llvm] 642a476 - [PowerPC] Rename PPCMCExpr's VK_PPC_ to VK_. NFC
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Wed Mar 12 21:55:21 PDT 2025
Author: Fangrui Song
Date: 2025-03-12T21:55:15-07:00
New Revision: 642a4763dfaa46dab151e68f0272ab2b4c8c31b0
URL: https://github.com/llvm/llvm-project/commit/642a4763dfaa46dab151e68f0272ab2b4c8c31b0
DIFF: https://github.com/llvm/llvm-project/commit/642a4763dfaa46dab151e68f0272ab2b4c8c31b0.diff
LOG: [PowerPC] Rename PPCMCExpr's VK_PPC_ to VK_. NFC
Make the name conciser. PPC-specific MCSymbolRefExpr::VariantKind
members will be moved to PPCMCExpr and we will not ue
MCSymbolRefExpr::VariantKind's "generic" members, so there won't be
mix-and-match.
Added:
Modified:
llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
index d20037605d7a4..b2c99b6013e92 100644
--- a/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
+++ b/llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp
@@ -1365,7 +1365,7 @@ ParseStatus PPCAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
}
/// Extract \code @l/@ha \endcode modifier from expression. Recursively scan
-/// the expression and check for VK_PPC_LO/HI/HA
+/// the expression and check for VK_LO/HI/HA
/// symbol variants. If all symbols with modifier use the same
/// variant, return the corresponding PPCMCExpr::VariantKind,
/// and a modified expression using the default symbol variant.
@@ -1385,32 +1385,32 @@ PPCAsmParser::extractModifierFromExpr(const MCExpr *E,
const MCSymbolRefExpr *SRE = cast<MCSymbolRefExpr>(E);
switch ((PPCMCExpr::VariantKind)SRE->getKind()) {
- case PPCMCExpr::VK_PPC_LO:
- Variant = PPCMCExpr::VK_PPC_LO;
+ case PPCMCExpr::VK_LO:
+ Variant = PPCMCExpr::VK_LO;
break;
- case PPCMCExpr::VK_PPC_HI:
- Variant = PPCMCExpr::VK_PPC_HI;
+ case PPCMCExpr::VK_HI:
+ Variant = PPCMCExpr::VK_HI;
break;
case PPCMCExpr::VK_PPC_HA:
Variant = PPCMCExpr::VK_PPC_HA;
break;
- case PPCMCExpr::VK_PPC_HIGH:
- Variant = PPCMCExpr::VK_PPC_HIGH;
+ case PPCMCExpr::VK_HIGH:
+ Variant = PPCMCExpr::VK_HIGH;
break;
- case PPCMCExpr::VK_PPC_HIGHA:
- Variant = PPCMCExpr::VK_PPC_HIGHA;
+ case PPCMCExpr::VK_HIGHA:
+ Variant = PPCMCExpr::VK_HIGHA;
break;
- case PPCMCExpr::VK_PPC_HIGHER:
- Variant = PPCMCExpr::VK_PPC_HIGHER;
+ case PPCMCExpr::VK_HIGHER:
+ Variant = PPCMCExpr::VK_HIGHER;
break;
- case PPCMCExpr::VK_PPC_HIGHERA:
- Variant = PPCMCExpr::VK_PPC_HIGHERA;
+ case PPCMCExpr::VK_HIGHERA:
+ Variant = PPCMCExpr::VK_HIGHERA;
break;
- case PPCMCExpr::VK_PPC_HIGHEST:
- Variant = PPCMCExpr::VK_PPC_HIGHEST;
+ case PPCMCExpr::VK_HIGHEST:
+ Variant = PPCMCExpr::VK_HIGHEST;
break;
- case PPCMCExpr::VK_PPC_HIGHESTA:
- Variant = PPCMCExpr::VK_PPC_HIGHESTA;
+ case PPCMCExpr::VK_HIGHESTA:
+ Variant = PPCMCExpr::VK_HIGHESTA;
break;
default:
return nullptr;
@@ -1854,15 +1854,15 @@ PPCAsmParser::applyModifierToExpr(const MCExpr *E,
MCContext &Ctx) {
if (isa<MCConstantExpr>(E)) {
switch (PPCMCExpr::VariantKind(Variant)) {
- case PPCMCExpr::VariantKind::VK_PPC_LO:
- case PPCMCExpr::VariantKind::VK_PPC_HI:
+ case PPCMCExpr::VariantKind::VK_LO:
+ case PPCMCExpr::VariantKind::VK_HI:
case PPCMCExpr::VariantKind::VK_PPC_HA:
- case PPCMCExpr::VariantKind::VK_PPC_HIGH:
- case PPCMCExpr::VariantKind::VK_PPC_HIGHA:
- case PPCMCExpr::VariantKind::VK_PPC_HIGHER:
- case PPCMCExpr::VariantKind::VK_PPC_HIGHERA:
- case PPCMCExpr::VariantKind::VK_PPC_HIGHEST:
- case PPCMCExpr::VariantKind::VK_PPC_HIGHESTA:
+ case PPCMCExpr::VariantKind::VK_HIGH:
+ case PPCMCExpr::VariantKind::VK_HIGHA:
+ case PPCMCExpr::VariantKind::VK_HIGHER:
+ case PPCMCExpr::VariantKind::VK_HIGHERA:
+ case PPCMCExpr::VariantKind::VK_HIGHEST:
+ case PPCMCExpr::VariantKind::VK_HIGHESTA:
break;
default:
return nullptr;
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
index 14e7be021e24d..7157dc4e275f5 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp
@@ -92,9 +92,9 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
return ELF::R_PPC_NONE;
case PPCMCExpr::VK_PPC_None:
return ELF::R_PPC_REL16;
- case PPCMCExpr::VK_PPC_LO:
+ case PPCMCExpr::VK_LO:
return ELF::R_PPC_REL16_LO;
- case PPCMCExpr::VK_PPC_HI:
+ case PPCMCExpr::VK_HI:
return ELF::R_PPC_REL16_HI;
case PPCMCExpr::VK_PPC_HA:
return ELF::R_PPC_REL16_HA;
@@ -148,23 +148,23 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
switch (RefKind) {
case PPCMCExpr::VK_PPC_None:
break;
- case PPCMCExpr::VK_PPC_LO:
+ case PPCMCExpr::VK_LO:
return ELF::R_PPC_ADDR16_LO;
- case PPCMCExpr::VK_PPC_HI:
+ case PPCMCExpr::VK_HI:
return ELF::R_PPC_ADDR16_HI;
case PPCMCExpr::VK_PPC_HA:
return ELF::R_PPC_ADDR16_HA;
- case PPCMCExpr::VK_PPC_HIGH:
+ case PPCMCExpr::VK_HIGH:
return ELF::R_PPC64_ADDR16_HIGH;
- case PPCMCExpr::VK_PPC_HIGHA:
+ case PPCMCExpr::VK_HIGHA:
return ELF::R_PPC64_ADDR16_HIGHA;
- case PPCMCExpr::VK_PPC_HIGHER:
+ case PPCMCExpr::VK_HIGHER:
return ELF::R_PPC64_ADDR16_HIGHER;
- case PPCMCExpr::VK_PPC_HIGHERA:
+ case PPCMCExpr::VK_HIGHERA:
return ELF::R_PPC64_ADDR16_HIGHERA;
- case PPCMCExpr::VK_PPC_HIGHEST:
+ case PPCMCExpr::VK_HIGHEST:
return ELF::R_PPC64_ADDR16_HIGHEST;
- case PPCMCExpr::VK_PPC_HIGHESTA:
+ case PPCMCExpr::VK_HIGHESTA:
return ELF::R_PPC64_ADDR16_HIGHESTA;
}
switch (Modifier) {
@@ -328,7 +328,7 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
return ELF::R_PPC64_NONE;
case PPCMCExpr::VK_PPC_None:
break;
- case PPCMCExpr::VK_PPC_LO:
+ case PPCMCExpr::VK_LO:
return ELF::R_PPC64_ADDR16_LO_DS;
}
switch (Modifier) {
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
index 71af7342f1a77..15c2ad02d19d1 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp
@@ -27,15 +27,15 @@ const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
{MCSymbolRefExpr::VK_TLSGD, "tlsgd"},
{MCSymbolRefExpr::VK_TLSLD, "tlsld"},
{MCSymbolRefExpr::VK_TPREL, "TPREL"},
- {PPCMCExpr::VK_PPC_LO, "l"},
- {PPCMCExpr::VK_PPC_HI, "h"},
+ {PPCMCExpr::VK_LO, "l"},
+ {PPCMCExpr::VK_HI, "h"},
{PPCMCExpr::VK_PPC_HA, "ha"},
- {PPCMCExpr::VK_PPC_HIGH, "high"},
- {PPCMCExpr::VK_PPC_HIGHA, "higha"},
- {PPCMCExpr::VK_PPC_HIGHER, "higher"},
- {PPCMCExpr::VK_PPC_HIGHERA, "highera"},
- {PPCMCExpr::VK_PPC_HIGHEST, "highest"},
- {PPCMCExpr::VK_PPC_HIGHESTA, "highesta"},
+ {PPCMCExpr::VK_HIGH, "high"},
+ {PPCMCExpr::VK_HIGHA, "higha"},
+ {PPCMCExpr::VK_HIGHER, "higher"},
+ {PPCMCExpr::VK_HIGHERA, "highera"},
+ {PPCMCExpr::VK_HIGHEST, "highest"},
+ {PPCMCExpr::VK_HIGHESTA, "highesta"},
{MCSymbolRefExpr::VK_PPC_GOT_LO, "got at l"},
{MCSymbolRefExpr::VK_PPC_GOT_HI, "got at h"},
{MCSymbolRefExpr::VK_PPC_GOT_HA, "got at ha"},
@@ -45,7 +45,7 @@ const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
{MCSymbolRefExpr::VK_PPC_TOC_HI, "toc at h"},
{MCSymbolRefExpr::VK_PPC_TOC_HA, "toc at ha"},
{MCSymbolRefExpr::VK_PPC_U, "u"},
- {MCSymbolRefExpr::VK_PPC_L, "l"}, // FIXME: share the name with VK_PPC_LO
+ {MCSymbolRefExpr::VK_PPC_L, "l"}, // FIXME: share the name with VK_LO
{MCSymbolRefExpr::VK_PPC_DTPMOD, "dtpmod"},
{MCSymbolRefExpr::VK_PPC_TPREL_LO, "tprel at l"},
{MCSymbolRefExpr::VK_PPC_TPREL_HI, "tprel at h"},
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
index 3ff6e0299de6b..03c86b1e8447f 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp
@@ -45,27 +45,27 @@ PPCMCExpr::evaluateAsConstant(int64_t &Res) const {
std::optional<int64_t> PPCMCExpr::evaluateAsInt64(int64_t Value) const {
switch (Kind) {
- case VK_PPC_LO:
- return Value & 0xffff;
- case VK_PPC_HI:
- return (Value >> 16) & 0xffff;
- case VK_PPC_HA:
- return ((Value + 0x8000) >> 16) & 0xffff;
- case VK_PPC_HIGH:
- return (Value >> 16) & 0xffff;
- case VK_PPC_HIGHA:
- return ((Value + 0x8000) >> 16) & 0xffff;
- case VK_PPC_HIGHER:
- return (Value >> 32) & 0xffff;
- case VK_PPC_HIGHERA:
- return ((Value + 0x8000) >> 32) & 0xffff;
- case VK_PPC_HIGHEST:
- return (Value >> 48) & 0xffff;
- case VK_PPC_HIGHESTA:
- return ((Value + 0x8000) >> 48) & 0xffff;
- default:
- return {};
- }
+ case VK_LO:
+ return Value & 0xffff;
+ case VK_HI:
+ return (Value >> 16) & 0xffff;
+ case VK_PPC_HA:
+ return ((Value + 0x8000) >> 16) & 0xffff;
+ case VK_HIGH:
+ return (Value >> 16) & 0xffff;
+ case VK_HIGHA:
+ return ((Value + 0x8000) >> 16) & 0xffff;
+ case VK_HIGHER:
+ return (Value >> 32) & 0xffff;
+ case VK_HIGHERA:
+ return ((Value + 0x8000) >> 32) & 0xffff;
+ case VK_HIGHEST:
+ return (Value >> 48) & 0xffff;
+ case VK_HIGHESTA:
+ return ((Value + 0x8000) >> 48) & 0xffff;
+ default:
+ return {};
+ }
}
bool PPCMCExpr::evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,
diff --git a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
index 79dad4156d4b3..fd5351dfb799c 100644
--- a/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
+++ b/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h
@@ -21,15 +21,15 @@ class PPCMCExpr : public MCTargetExpr {
VK_PPC_None,
// We currently use both MCSymbolRefExpr::VariantKind and
// PPCMCExpr::VariantKind. Start at a larger number to avoid conflicts.
- VK_PPC_LO = 200,
- VK_PPC_HI,
+ VK_LO = 200,
+ VK_HI,
VK_PPC_HA,
- VK_PPC_HIGH,
- VK_PPC_HIGHA,
- VK_PPC_HIGHER,
- VK_PPC_HIGHERA,
- VK_PPC_HIGHEST,
- VK_PPC_HIGHESTA
+ VK_HIGH,
+ VK_HIGHA,
+ VK_HIGHER,
+ VK_HIGHERA,
+ VK_HIGHEST,
+ VK_HIGHESTA,
};
private:
@@ -49,11 +49,11 @@ class PPCMCExpr : public MCTargetExpr {
MCContext &Ctx);
static const PPCMCExpr *createLo(const MCExpr *Expr, MCContext &Ctx) {
- return create(VK_PPC_LO, Expr, Ctx);
+ return create(VK_LO, Expr, Ctx);
}
static const PPCMCExpr *createHi(const MCExpr *Expr, MCContext &Ctx) {
- return create(VK_PPC_HI, Expr, Ctx);
+ return create(VK_HI, Expr, Ctx);
}
static const PPCMCExpr *createHa(const MCExpr *Expr, MCContext &Ctx) {
diff --git a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
index be0df763029a5..c9e9b917e3175 100644
--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
@@ -1404,7 +1404,7 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
MCSymbol *GOTSymbol =
OutContext.getOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_"));
const MCExpr *SymGotTlsL = PPCMCExpr::create(
- PPCMCExpr::VK_PPC_LO, MCSymbolRefExpr::create(GOTSymbol, OutContext),
+ PPCMCExpr::VK_LO, MCSymbolRefExpr::create(GOTSymbol, OutContext),
OutContext);
const MCExpr *SymGotTlsHA = PPCMCExpr::create(
PPCMCExpr::VK_PPC_HA, MCSymbolRefExpr::create(GOTSymbol, OutContext),
More information about the llvm-commits
mailing list