[llvm] 5cf138a - M68k: Replace M68kMCExpr::VK_ to M68k::S_
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sun Jun 15 12:53:35 PDT 2025
Author: Fangrui Song
Date: 2025-06-15T12:53:30-07:00
New Revision: 5cf138a68744904562e81436181df668b00cdb1f
URL: https://github.com/llvm/llvm-project/commit/5cf138a68744904562e81436181df668b00cdb1f
DIFF: https://github.com/llvm/llvm-project/commit/5cf138a68744904562e81436181df668b00cdb1f.diff
LOG: M68k: Replace M68kMCExpr::VK_ to M68k::S_
Prepare for removing VEMCExpr. Adopt the newer naming convention adopted
by AMDGPU/WebAssembly/VE.
Added:
Modified:
llvm/lib/Target/M68k/M68kISelLowering.cpp
llvm/lib/Target/M68k/M68kMCInstLower.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp
llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h
Removed:
################################################################################
diff --git a/llvm/lib/Target/M68k/M68kISelLowering.cpp b/llvm/lib/Target/M68k/M68kISelLowering.cpp
index 9d3ab606ab8cd..c1860fa88a83b 100644
--- a/llvm/lib/Target/M68k/M68kISelLowering.cpp
+++ b/llvm/lib/Target/M68k/M68kISelLowering.cpp
@@ -2833,7 +2833,7 @@ unsigned M68kTargetLowering::getJumpTableEncoding() const {
const MCExpr *M68kTargetLowering::LowerCustomJumpTableEntry(
const MachineJumpTableInfo *MJTI, const MachineBasicBlock *MBB,
unsigned uid, MCContext &Ctx) const {
- return MCSymbolRefExpr::create(MBB->getSymbol(), M68kMCExpr::VK_GOTOFF, Ctx);
+ return MCSymbolRefExpr::create(MBB->getSymbol(), M68k::S_GOTOFF, Ctx);
}
SDValue M68kTargetLowering::getPICJumpTableRelocBase(SDValue Table,
diff --git a/llvm/lib/Target/M68k/M68kMCInstLower.cpp b/llvm/lib/Target/M68k/M68kMCInstLower.cpp
index 8698fc0de4710..b256d56c032c5 100644
--- a/llvm/lib/Target/M68k/M68kMCInstLower.cpp
+++ b/llvm/lib/Target/M68k/M68kMCInstLower.cpp
@@ -76,7 +76,7 @@ MCOperand M68kMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
// FIXME We would like an efficient form for this, so we don't have to do a
// lot of extra uniquing. This fixme is originally from X86
const MCExpr *Expr = nullptr;
- M68kMCExpr::Specifier RefKind = M68kMCExpr::VK_None;
+ M68k::Specifier RefKind = M68k::S_None;
switch (MO.getTargetFlags()) {
default:
@@ -86,31 +86,31 @@ MCOperand M68kMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
case M68kII::MO_PC_RELATIVE_ADDRESS:
break;
case M68kII::MO_GOTPCREL:
- RefKind = M68kMCExpr::VK_GOTPCREL;
+ RefKind = M68k::S_GOTPCREL;
break;
case M68kII::MO_GOT:
- RefKind = M68kMCExpr::VK_GOT;
+ RefKind = M68k::S_GOT;
break;
case M68kII::MO_GOTOFF:
- RefKind = M68kMCExpr::VK_GOTOFF;
+ RefKind = M68k::S_GOTOFF;
break;
case M68kII::MO_PLT:
- RefKind = M68kMCExpr::VK_PLT;
+ RefKind = M68k::S_PLT;
break;
case M68kII::MO_TLSGD:
- RefKind = M68kMCExpr::VK_TLSGD;
+ RefKind = M68k::S_TLSGD;
break;
case M68kII::MO_TLSLD:
- RefKind = M68kMCExpr::VK_TLSLD;
+ RefKind = M68k::S_TLSLD;
break;
case M68kII::MO_TLSLDM:
- RefKind = M68kMCExpr::VK_TLSLDM;
+ RefKind = M68k::S_TLSLDM;
break;
case M68kII::MO_TLSIE:
- RefKind = M68kMCExpr::VK_GOTTPOFF;
+ RefKind = M68k::S_GOTTPOFF;
break;
case M68kII::MO_TLSLE:
- RefKind = M68kMCExpr::VK_TPOFF;
+ RefKind = M68k::S_TPOFF;
break;
}
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
index 1a61325008aab..3f7593cf4352c 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp
@@ -45,7 +45,7 @@ M68kELFObjectWriter::~M68kELFObjectWriter() {}
enum M68kRelType { RT_32, RT_16, RT_8 };
-static M68kRelType getType(unsigned Kind, M68kMCExpr::Specifier &Modifier,
+static M68kRelType getType(unsigned Kind, M68k::Specifier &Modifier,
bool &IsPCRel) {
switch (Kind) {
case FK_Data_4:
@@ -64,15 +64,15 @@ static M68kRelType getType(unsigned Kind, M68kMCExpr::Specifier &Modifier,
unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
const MCValue &Target,
bool IsPCRel) const {
- auto Specifier = M68kMCExpr::Specifier(Target.getSpecifier());
+ auto Specifier = M68k::Specifier(Target.getSpecifier());
unsigned Kind = Fixup.getKind();
M68kRelType Type = getType(Kind, Specifier, IsPCRel);
switch (Specifier) {
- case M68kMCExpr::VK_GOTTPOFF:
- case M68kMCExpr::VK_TLSGD:
- case M68kMCExpr::VK_TLSLD:
- case M68kMCExpr::VK_TLSLDM:
- case M68kMCExpr::VK_TPOFF:
+ case M68k::S_GOTTPOFF:
+ case M68k::S_TLSGD:
+ case M68k::S_TLSLD:
+ case M68k::S_TLSLDM:
+ case M68k::S_TPOFF:
if (auto *SA = Target.getAddSym())
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
break;
@@ -84,7 +84,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
default:
llvm_unreachable("Unimplemented");
- case M68kMCExpr::VK_TLSGD:
+ case M68k::S_TLSGD:
switch (Type) {
case RT_32:
return ELF::R_68K_TLS_GD32;
@@ -94,7 +94,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_TLS_GD8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_TLSLDM:
+ case M68k::S_TLSLDM:
switch (Type) {
case RT_32:
return ELF::R_68K_TLS_LDM32;
@@ -104,7 +104,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_TLS_LDM8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_TLSLD:
+ case M68k::S_TLSLD:
switch (Type) {
case RT_32:
return ELF::R_68K_TLS_LDO32;
@@ -114,7 +114,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_TLS_LDO8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_GOTTPOFF:
+ case M68k::S_GOTTPOFF:
switch (Type) {
case RT_32:
return ELF::R_68K_TLS_IE32;
@@ -124,7 +124,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_TLS_IE8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_TPOFF:
+ case M68k::S_TPOFF:
switch (Type) {
case RT_32:
return ELF::R_68K_TLS_LE32;
@@ -134,7 +134,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_TLS_LE8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_None:
+ case M68k::S_None:
switch (Type) {
case RT_32:
return IsPCRel ? ELF::R_68K_PC32 : ELF::R_68K_32;
@@ -144,7 +144,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return IsPCRel ? ELF::R_68K_PC8 : ELF::R_68K_8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_GOTPCREL:
+ case M68k::S_GOTPCREL:
switch (Type) {
case RT_32:
return ELF::R_68K_GOTPCREL32;
@@ -154,7 +154,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_GOTPCREL8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_GOTOFF:
+ case M68k::S_GOTOFF:
assert(!IsPCRel);
switch (Type) {
case RT_32:
@@ -165,7 +165,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
return ELF::R_68K_GOTOFF8;
}
llvm_unreachable("Unrecognized size");
- case M68kMCExpr::VK_PLT:
+ case M68k::S_PLT:
switch (Type) {
case RT_32:
return ELF::R_68K_PLT32;
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
index ba1b0dc2bb090..8259546fbae57 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp
@@ -20,14 +20,10 @@
using namespace llvm;
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
- {M68kMCExpr::VK_GOTOFF, "GOTOFF"},
- {M68kMCExpr::VK_GOTPCREL, "GOTPCREL"},
- {M68kMCExpr::VK_GOTTPOFF, "GOTTPOFF"},
- {M68kMCExpr::VK_PLT, "PLT"},
- {M68kMCExpr::VK_TLSGD, "TLSGD"},
- {M68kMCExpr::VK_TLSLD, "TLSLD"},
- {M68kMCExpr::VK_TLSLDM, "TLSLDM"},
- {M68kMCExpr::VK_TPOFF, "TPOFF"},
+ {M68k::S_GOTOFF, "GOTOFF"}, {M68k::S_GOTPCREL, "GOTPCREL"},
+ {M68k::S_GOTTPOFF, "GOTTPOFF"}, {M68k::S_PLT, "PLT"},
+ {M68k::S_TLSGD, "TLSGD"}, {M68k::S_TLSLD, "TLSLD"},
+ {M68k::S_TLSLDM, "TLSLDM"}, {M68k::S_TPOFF, "TPOFF"},
};
void M68kELFMCAsmInfo::anchor() {}
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp
index 22d8da263cea5..18301d7ea9b39 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp
@@ -13,7 +13,7 @@
using namespace llvm;
-const M68kMCExpr *M68kMCExpr::create(const MCExpr *Expr, Specifier S,
+const M68kMCExpr *M68kMCExpr::create(const MCExpr *Expr, Spec S,
MCContext &Ctx) {
return new (Ctx) M68kMCExpr(Expr, S);
}
diff --git a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h
index 02bffdcb2889b..39a2898e2eda7 100644
--- a/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h
+++ b/llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h
@@ -19,30 +19,28 @@
namespace llvm {
class M68kMCExpr : public MCSpecifierExpr {
-public:
- enum Specifier {
- VK_None,
-
- VK_GOT = MCSymbolRefExpr::FirstTargetSpecifier,
- VK_GOTOFF,
- VK_GOTPCREL,
- VK_GOTTPOFF,
- VK_PLT,
- VK_TLSGD,
- VK_TLSLD,
- VK_TLSLDM,
- VK_TPOFF,
- };
-
protected:
- explicit M68kMCExpr(const MCExpr *Expr, Specifier S)
- : MCSpecifierExpr(Expr, S) {}
+ explicit M68kMCExpr(const MCExpr *Expr, Spec S) : MCSpecifierExpr(Expr, S) {}
public:
- static const M68kMCExpr *create(const MCExpr *, Specifier, MCContext &);
+ static const M68kMCExpr *create(const MCExpr *, Spec, MCContext &);
void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
};
+namespace M68k {
+enum Specifier {
+ S_None,
+ S_GOT,
+ S_GOTOFF,
+ S_GOTPCREL,
+ S_GOTTPOFF,
+ S_PLT,
+ S_TLSGD,
+ S_TLSLD,
+ S_TLSLDM,
+ S_TPOFF,
+};
+}
} // namespace llvm
#endif
More information about the llvm-commits
mailing list