Skip to content

Commit 42d74ef

Browse files
MaskRayakuhlens
MaskRay
authored and
akuhlens
committed
M68k: Replace M68kMCExpr::VK_ to M68k::S_
Prepare for removing VEMCExpr. Adopt the newer naming convention adopted by AMDGPU/WebAssembly/VE.
1 parent 79a6447 commit 42d74ef

File tree

6 files changed

+48
-54
lines changed

6 files changed

+48
-54
lines changed

‎llvm/lib/Target/M68k/M68kISelLowering.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2833,7 +2833,7 @@ unsigned M68kTargetLowering::getJumpTableEncoding() const {
28332833
const MCExpr *M68kTargetLowering::LowerCustomJumpTableEntry(
28342834
const MachineJumpTableInfo *MJTI, const MachineBasicBlock *MBB,
28352835
unsigned uid, MCContext &Ctx) const {
2836-
return MCSymbolRefExpr::create(MBB->getSymbol(), M68kMCExpr::VK_GOTOFF, Ctx);
2836+
return MCSymbolRefExpr::create(MBB->getSymbol(), M68k::S_GOTOFF, Ctx);
28372837
}
28382838

28392839
SDValue M68kTargetLowering::getPICJumpTableRelocBase(SDValue Table,

‎llvm/lib/Target/M68k/M68kMCInstLower.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ MCOperand M68kMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
7676
// FIXME We would like an efficient form for this, so we don't have to do a
7777
// lot of extra uniquing. This fixme is originally from X86
7878
const MCExpr *Expr = nullptr;
79-
M68kMCExpr::Specifier RefKind = M68kMCExpr::VK_None;
79+
M68k::Specifier RefKind = M68k::S_None;
8080

8181
switch (MO.getTargetFlags()) {
8282
default:
@@ -86,31 +86,31 @@ MCOperand M68kMCInstLower::LowerSymbolOperand(const MachineOperand &MO,
8686
case M68kII::MO_PC_RELATIVE_ADDRESS:
8787
break;
8888
case M68kII::MO_GOTPCREL:
89-
RefKind = M68kMCExpr::VK_GOTPCREL;
89+
RefKind = M68k::S_GOTPCREL;
9090
break;
9191
case M68kII::MO_GOT:
92-
RefKind = M68kMCExpr::VK_GOT;
92+
RefKind = M68k::S_GOT;
9393
break;
9494
case M68kII::MO_GOTOFF:
95-
RefKind = M68kMCExpr::VK_GOTOFF;
95+
RefKind = M68k::S_GOTOFF;
9696
break;
9797
case M68kII::MO_PLT:
98-
RefKind = M68kMCExpr::VK_PLT;
98+
RefKind = M68k::S_PLT;
9999
break;
100100
case M68kII::MO_TLSGD:
101-
RefKind = M68kMCExpr::VK_TLSGD;
101+
RefKind = M68k::S_TLSGD;
102102
break;
103103
case M68kII::MO_TLSLD:
104-
RefKind = M68kMCExpr::VK_TLSLD;
104+
RefKind = M68k::S_TLSLD;
105105
break;
106106
case M68kII::MO_TLSLDM:
107-
RefKind = M68kMCExpr::VK_TLSLDM;
107+
RefKind = M68k::S_TLSLDM;
108108
break;
109109
case M68kII::MO_TLSIE:
110-
RefKind = M68kMCExpr::VK_GOTTPOFF;
110+
RefKind = M68k::S_GOTTPOFF;
111111
break;
112112
case M68kII::MO_TLSLE:
113-
RefKind = M68kMCExpr::VK_TPOFF;
113+
RefKind = M68k::S_TPOFF;
114114
break;
115115
}
116116

‎llvm/lib/Target/M68k/MCTargetDesc/M68kELFObjectWriter.cpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ M68kELFObjectWriter::~M68kELFObjectWriter() {}
4545

4646
enum M68kRelType { RT_32, RT_16, RT_8 };
4747

48-
static M68kRelType getType(unsigned Kind, M68kMCExpr::Specifier &Modifier,
48+
static M68kRelType getType(unsigned Kind, M68k::Specifier &Modifier,
4949
bool &IsPCRel) {
5050
switch (Kind) {
5151
case FK_Data_4:
@@ -64,15 +64,15 @@ static M68kRelType getType(unsigned Kind, M68kMCExpr::Specifier &Modifier,
6464
unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
6565
const MCValue &Target,
6666
bool IsPCRel) const {
67-
auto Specifier = M68kMCExpr::Specifier(Target.getSpecifier());
67+
auto Specifier = M68k::Specifier(Target.getSpecifier());
6868
unsigned Kind = Fixup.getKind();
6969
M68kRelType Type = getType(Kind, Specifier, IsPCRel);
7070
switch (Specifier) {
71-
case M68kMCExpr::VK_GOTTPOFF:
72-
case M68kMCExpr::VK_TLSGD:
73-
case M68kMCExpr::VK_TLSLD:
74-
case M68kMCExpr::VK_TLSLDM:
75-
case M68kMCExpr::VK_TPOFF:
71+
case M68k::S_GOTTPOFF:
72+
case M68k::S_TLSGD:
73+
case M68k::S_TLSLD:
74+
case M68k::S_TLSLDM:
75+
case M68k::S_TPOFF:
7676
if (auto *SA = Target.getAddSym())
7777
cast<MCSymbolELF>(SA)->setType(ELF::STT_TLS);
7878
break;
@@ -84,7 +84,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
8484
default:
8585
llvm_unreachable("Unimplemented");
8686

87-
case M68kMCExpr::VK_TLSGD:
87+
case M68k::S_TLSGD:
8888
switch (Type) {
8989
case RT_32:
9090
return ELF::R_68K_TLS_GD32;
@@ -94,7 +94,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
9494
return ELF::R_68K_TLS_GD8;
9595
}
9696
llvm_unreachable("Unrecognized size");
97-
case M68kMCExpr::VK_TLSLDM:
97+
case M68k::S_TLSLDM:
9898
switch (Type) {
9999
case RT_32:
100100
return ELF::R_68K_TLS_LDM32;
@@ -104,7 +104,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
104104
return ELF::R_68K_TLS_LDM8;
105105
}
106106
llvm_unreachable("Unrecognized size");
107-
case M68kMCExpr::VK_TLSLD:
107+
case M68k::S_TLSLD:
108108
switch (Type) {
109109
case RT_32:
110110
return ELF::R_68K_TLS_LDO32;
@@ -114,7 +114,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
114114
return ELF::R_68K_TLS_LDO8;
115115
}
116116
llvm_unreachable("Unrecognized size");
117-
case M68kMCExpr::VK_GOTTPOFF:
117+
case M68k::S_GOTTPOFF:
118118
switch (Type) {
119119
case RT_32:
120120
return ELF::R_68K_TLS_IE32;
@@ -124,7 +124,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
124124
return ELF::R_68K_TLS_IE8;
125125
}
126126
llvm_unreachable("Unrecognized size");
127-
case M68kMCExpr::VK_TPOFF:
127+
case M68k::S_TPOFF:
128128
switch (Type) {
129129
case RT_32:
130130
return ELF::R_68K_TLS_LE32;
@@ -134,7 +134,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
134134
return ELF::R_68K_TLS_LE8;
135135
}
136136
llvm_unreachable("Unrecognized size");
137-
case M68kMCExpr::VK_None:
137+
case M68k::S_None:
138138
switch (Type) {
139139
case RT_32:
140140
return IsPCRel ? ELF::R_68K_PC32 : ELF::R_68K_32;
@@ -144,7 +144,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
144144
return IsPCRel ? ELF::R_68K_PC8 : ELF::R_68K_8;
145145
}
146146
llvm_unreachable("Unrecognized size");
147-
case M68kMCExpr::VK_GOTPCREL:
147+
case M68k::S_GOTPCREL:
148148
switch (Type) {
149149
case RT_32:
150150
return ELF::R_68K_GOTPCREL32;
@@ -154,7 +154,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
154154
return ELF::R_68K_GOTPCREL8;
155155
}
156156
llvm_unreachable("Unrecognized size");
157-
case M68kMCExpr::VK_GOTOFF:
157+
case M68k::S_GOTOFF:
158158
assert(!IsPCRel);
159159
switch (Type) {
160160
case RT_32:
@@ -165,7 +165,7 @@ unsigned M68kELFObjectWriter::getRelocType(const MCFixup &Fixup,
165165
return ELF::R_68K_GOTOFF8;
166166
}
167167
llvm_unreachable("Unrecognized size");
168-
case M68kMCExpr::VK_PLT:
168+
case M68k::S_PLT:
169169
switch (Type) {
170170
case RT_32:
171171
return ELF::R_68K_PLT32;

‎llvm/lib/Target/M68k/MCTargetDesc/M68kMCAsmInfo.cpp‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,10 @@
2020
using namespace llvm;
2121

2222
const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
23-
{M68kMCExpr::VK_GOTOFF, "GOTOFF"},
24-
{M68kMCExpr::VK_GOTPCREL, "GOTPCREL"},
25-
{M68kMCExpr::VK_GOTTPOFF, "GOTTPOFF"},
26-
{M68kMCExpr::VK_PLT, "PLT"},
27-
{M68kMCExpr::VK_TLSGD, "TLSGD"},
28-
{M68kMCExpr::VK_TLSLD, "TLSLD"},
29-
{M68kMCExpr::VK_TLSLDM, "TLSLDM"},
30-
{M68kMCExpr::VK_TPOFF, "TPOFF"},
23+
{M68k::S_GOTOFF, "GOTOFF"}, {M68k::S_GOTPCREL, "GOTPCREL"},
24+
{M68k::S_GOTTPOFF, "GOTTPOFF"}, {M68k::S_PLT, "PLT"},
25+
{M68k::S_TLSGD, "TLSGD"}, {M68k::S_TLSLD, "TLSLD"},
26+
{M68k::S_TLSLDM, "TLSLDM"}, {M68k::S_TPOFF, "TPOFF"},
3127
};
3228

3329
void M68kELFMCAsmInfo::anchor() {}

‎llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
using namespace llvm;
1515

16-
const M68kMCExpr *M68kMCExpr::create(const MCExpr *Expr, Specifier S,
16+
const M68kMCExpr *M68kMCExpr::create(const MCExpr *Expr, Spec S,
1717
MCContext &Ctx) {
1818
return new (Ctx) M68kMCExpr(Expr, S);
1919
}

‎llvm/lib/Target/M68k/MCTargetDesc/M68kMCExpr.h‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,28 @@
1919
namespace llvm {
2020

2121
class M68kMCExpr : public MCSpecifierExpr {
22-
public:
23-
enum Specifier {
24-
VK_None,
25-
26-
VK_GOT = MCSymbolRefExpr::FirstTargetSpecifier,
27-
VK_GOTOFF,
28-
VK_GOTPCREL,
29-
VK_GOTTPOFF,
30-
VK_PLT,
31-
VK_TLSGD,
32-
VK_TLSLD,
33-
VK_TLSLDM,
34-
VK_TPOFF,
35-
};
36-
3722
protected:
38-
explicit M68kMCExpr(const MCExpr *Expr, Specifier S)
39-
: MCSpecifierExpr(Expr, S) {}
23+
explicit M68kMCExpr(const MCExpr *Expr, Spec S) : MCSpecifierExpr(Expr, S) {}
4024

4125
public:
42-
static const M68kMCExpr *create(const MCExpr *, Specifier, MCContext &);
26+
static const M68kMCExpr *create(const MCExpr *, Spec, MCContext &);
4327

4428
void printImpl(raw_ostream &OS, const MCAsmInfo *MAI) const override;
4529
};
30+
namespace M68k {
31+
enum Specifier {
32+
S_None,
33+
S_GOT,
34+
S_GOTOFF,
35+
S_GOTPCREL,
36+
S_GOTTPOFF,
37+
S_PLT,
38+
S_TLSGD,
39+
S_TLSLD,
40+
S_TLSLDM,
41+
S_TPOFF,
42+
};
43+
}
4644
} // namespace llvm
4745

4846
#endif

0 commit comments

Comments
 (0)