Skip to content

Commit 642a476

Browse files
MaskRayMaskRay
committed
[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.
1 parent fe0d3e3 commit 642a476

File tree

6 files changed

+77
-77
lines changed

6 files changed

+77
-77
lines changed

‎llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,7 +1365,7 @@ ParseStatus PPCAsmParser::tryParseRegister(MCRegister &Reg, SMLoc &StartLoc,
13651365
}
13661366

13671367
/// Extract \code @l/@ha \endcode modifier from expression. Recursively scan
1368-
/// the expression and check for VK_PPC_LO/HI/HA
1368+
/// the expression and check for VK_LO/HI/HA
13691369
/// symbol variants. If all symbols with modifier use the same
13701370
/// variant, return the corresponding PPCMCExpr::VariantKind,
13711371
/// and a modified expression using the default symbol variant.
@@ -1385,32 +1385,32 @@ PPCAsmParser::extractModifierFromExpr(const MCExpr *E,
13851385
const MCSymbolRefExpr *SRE = cast<MCSymbolRefExpr>(E);
13861386

13871387
switch ((PPCMCExpr::VariantKind)SRE->getKind()) {
1388-
case PPCMCExpr::VK_PPC_LO:
1389-
Variant = PPCMCExpr::VK_PPC_LO;
1388+
case PPCMCExpr::VK_LO:
1389+
Variant = PPCMCExpr::VK_LO;
13901390
break;
1391-
case PPCMCExpr::VK_PPC_HI:
1392-
Variant = PPCMCExpr::VK_PPC_HI;
1391+
case PPCMCExpr::VK_HI:
1392+
Variant = PPCMCExpr::VK_HI;
13931393
break;
13941394
case PPCMCExpr::VK_PPC_HA:
13951395
Variant = PPCMCExpr::VK_PPC_HA;
13961396
break;
1397-
case PPCMCExpr::VK_PPC_HIGH:
1398-
Variant = PPCMCExpr::VK_PPC_HIGH;
1397+
case PPCMCExpr::VK_HIGH:
1398+
Variant = PPCMCExpr::VK_HIGH;
13991399
break;
1400-
case PPCMCExpr::VK_PPC_HIGHA:
1401-
Variant = PPCMCExpr::VK_PPC_HIGHA;
1400+
case PPCMCExpr::VK_HIGHA:
1401+
Variant = PPCMCExpr::VK_HIGHA;
14021402
break;
1403-
case PPCMCExpr::VK_PPC_HIGHER:
1404-
Variant = PPCMCExpr::VK_PPC_HIGHER;
1403+
case PPCMCExpr::VK_HIGHER:
1404+
Variant = PPCMCExpr::VK_HIGHER;
14051405
break;
1406-
case PPCMCExpr::VK_PPC_HIGHERA:
1407-
Variant = PPCMCExpr::VK_PPC_HIGHERA;
1406+
case PPCMCExpr::VK_HIGHERA:
1407+
Variant = PPCMCExpr::VK_HIGHERA;
14081408
break;
1409-
case PPCMCExpr::VK_PPC_HIGHEST:
1410-
Variant = PPCMCExpr::VK_PPC_HIGHEST;
1409+
case PPCMCExpr::VK_HIGHEST:
1410+
Variant = PPCMCExpr::VK_HIGHEST;
14111411
break;
1412-
case PPCMCExpr::VK_PPC_HIGHESTA:
1413-
Variant = PPCMCExpr::VK_PPC_HIGHESTA;
1412+
case PPCMCExpr::VK_HIGHESTA:
1413+
Variant = PPCMCExpr::VK_HIGHESTA;
14141414
break;
14151415
default:
14161416
return nullptr;
@@ -1854,15 +1854,15 @@ PPCAsmParser::applyModifierToExpr(const MCExpr *E,
18541854
MCContext &Ctx) {
18551855
if (isa<MCConstantExpr>(E)) {
18561856
switch (PPCMCExpr::VariantKind(Variant)) {
1857-
case PPCMCExpr::VariantKind::VK_PPC_LO:
1858-
case PPCMCExpr::VariantKind::VK_PPC_HI:
1857+
case PPCMCExpr::VariantKind::VK_LO:
1858+
case PPCMCExpr::VariantKind::VK_HI:
18591859
case PPCMCExpr::VariantKind::VK_PPC_HA:
1860-
case PPCMCExpr::VariantKind::VK_PPC_HIGH:
1861-
case PPCMCExpr::VariantKind::VK_PPC_HIGHA:
1862-
case PPCMCExpr::VariantKind::VK_PPC_HIGHER:
1863-
case PPCMCExpr::VariantKind::VK_PPC_HIGHERA:
1864-
case PPCMCExpr::VariantKind::VK_PPC_HIGHEST:
1865-
case PPCMCExpr::VariantKind::VK_PPC_HIGHESTA:
1860+
case PPCMCExpr::VariantKind::VK_HIGH:
1861+
case PPCMCExpr::VariantKind::VK_HIGHA:
1862+
case PPCMCExpr::VariantKind::VK_HIGHER:
1863+
case PPCMCExpr::VariantKind::VK_HIGHERA:
1864+
case PPCMCExpr::VariantKind::VK_HIGHEST:
1865+
case PPCMCExpr::VariantKind::VK_HIGHESTA:
18661866
break;
18671867
default:
18681868
return nullptr;

‎llvm/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
9292
return ELF::R_PPC_NONE;
9393
case PPCMCExpr::VK_PPC_None:
9494
return ELF::R_PPC_REL16;
95-
case PPCMCExpr::VK_PPC_LO:
95+
case PPCMCExpr::VK_LO:
9696
return ELF::R_PPC_REL16_LO;
97-
case PPCMCExpr::VK_PPC_HI:
97+
case PPCMCExpr::VK_HI:
9898
return ELF::R_PPC_REL16_HI;
9999
case PPCMCExpr::VK_PPC_HA:
100100
return ELF::R_PPC_REL16_HA;
@@ -148,23 +148,23 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
148148
switch (RefKind) {
149149
case PPCMCExpr::VK_PPC_None:
150150
break;
151-
case PPCMCExpr::VK_PPC_LO:
151+
case PPCMCExpr::VK_LO:
152152
return ELF::R_PPC_ADDR16_LO;
153-
case PPCMCExpr::VK_PPC_HI:
153+
case PPCMCExpr::VK_HI:
154154
return ELF::R_PPC_ADDR16_HI;
155155
case PPCMCExpr::VK_PPC_HA:
156156
return ELF::R_PPC_ADDR16_HA;
157-
case PPCMCExpr::VK_PPC_HIGH:
157+
case PPCMCExpr::VK_HIGH:
158158
return ELF::R_PPC64_ADDR16_HIGH;
159-
case PPCMCExpr::VK_PPC_HIGHA:
159+
case PPCMCExpr::VK_HIGHA:
160160
return ELF::R_PPC64_ADDR16_HIGHA;
161-
case PPCMCExpr::VK_PPC_HIGHER:
161+
case PPCMCExpr::VK_HIGHER:
162162
return ELF::R_PPC64_ADDR16_HIGHER;
163-
case PPCMCExpr::VK_PPC_HIGHERA:
163+
case PPCMCExpr::VK_HIGHERA:
164164
return ELF::R_PPC64_ADDR16_HIGHERA;
165-
case PPCMCExpr::VK_PPC_HIGHEST:
165+
case PPCMCExpr::VK_HIGHEST:
166166
return ELF::R_PPC64_ADDR16_HIGHEST;
167-
case PPCMCExpr::VK_PPC_HIGHESTA:
167+
case PPCMCExpr::VK_HIGHESTA:
168168
return ELF::R_PPC64_ADDR16_HIGHESTA;
169169
}
170170
switch (Modifier) {
@@ -328,7 +328,7 @@ unsigned PPCELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
328328
return ELF::R_PPC64_NONE;
329329
case PPCMCExpr::VK_PPC_None:
330330
break;
331-
case PPCMCExpr::VK_PPC_LO:
331+
case PPCMCExpr::VK_LO:
332332
return ELF::R_PPC64_ADDR16_LO_DS;
333333
}
334334
switch (Modifier) {

‎llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCAsmInfo.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
2727
{MCSymbolRefExpr::VK_TLSGD, "tlsgd"},
2828
{MCSymbolRefExpr::VK_TLSLD, "tlsld"},
2929
{MCSymbolRefExpr::VK_TPREL, "TPREL"},
30-
{PPCMCExpr::VK_PPC_LO, "l"},
31-
{PPCMCExpr::VK_PPC_HI, "h"},
30+
{PPCMCExpr::VK_LO, "l"},
31+
{PPCMCExpr::VK_HI, "h"},
3232
{PPCMCExpr::VK_PPC_HA, "ha"},
33-
{PPCMCExpr::VK_PPC_HIGH, "high"},
34-
{PPCMCExpr::VK_PPC_HIGHA, "higha"},
35-
{PPCMCExpr::VK_PPC_HIGHER, "higher"},
36-
{PPCMCExpr::VK_PPC_HIGHERA, "highera"},
37-
{PPCMCExpr::VK_PPC_HIGHEST, "highest"},
38-
{PPCMCExpr::VK_PPC_HIGHESTA, "highesta"},
33+
{PPCMCExpr::VK_HIGH, "high"},
34+
{PPCMCExpr::VK_HIGHA, "higha"},
35+
{PPCMCExpr::VK_HIGHER, "higher"},
36+
{PPCMCExpr::VK_HIGHERA, "highera"},
37+
{PPCMCExpr::VK_HIGHEST, "highest"},
38+
{PPCMCExpr::VK_HIGHESTA, "highesta"},
3939
{MCSymbolRefExpr::VK_PPC_GOT_LO, "got@l"},
4040
{MCSymbolRefExpr::VK_PPC_GOT_HI, "got@h"},
4141
{MCSymbolRefExpr::VK_PPC_GOT_HA, "got@ha"},
@@ -45,7 +45,7 @@ const MCAsmInfo::VariantKindDesc variantKindDescs[] = {
4545
{MCSymbolRefExpr::VK_PPC_TOC_HI, "toc@h"},
4646
{MCSymbolRefExpr::VK_PPC_TOC_HA, "toc@ha"},
4747
{MCSymbolRefExpr::VK_PPC_U, "u"},
48-
{MCSymbolRefExpr::VK_PPC_L, "l"}, // FIXME: share the name with VK_PPC_LO
48+
{MCSymbolRefExpr::VK_PPC_L, "l"}, // FIXME: share the name with VK_LO
4949
{MCSymbolRefExpr::VK_PPC_DTPMOD, "dtpmod"},
5050
{MCSymbolRefExpr::VK_PPC_TPREL_LO, "tprel@l"},
5151
{MCSymbolRefExpr::VK_PPC_TPREL_HI, "tprel@h"},

‎llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ PPCMCExpr::evaluateAsConstant(int64_t &Res) const {
4545

4646
std::optional<int64_t> PPCMCExpr::evaluateAsInt64(int64_t Value) const {
4747
switch (Kind) {
48-
case VK_PPC_LO:
49-
return Value & 0xffff;
50-
case VK_PPC_HI:
51-
return (Value >> 16) & 0xffff;
52-
case VK_PPC_HA:
53-
return ((Value + 0x8000) >> 16) & 0xffff;
54-
case VK_PPC_HIGH:
55-
return (Value >> 16) & 0xffff;
56-
case VK_PPC_HIGHA:
57-
return ((Value + 0x8000) >> 16) & 0xffff;
58-
case VK_PPC_HIGHER:
59-
return (Value >> 32) & 0xffff;
60-
case VK_PPC_HIGHERA:
61-
return ((Value + 0x8000) >> 32) & 0xffff;
62-
case VK_PPC_HIGHEST:
63-
return (Value >> 48) & 0xffff;
64-
case VK_PPC_HIGHESTA:
65-
return ((Value + 0x8000) >> 48) & 0xffff;
66-
default:
67-
return {};
68-
}
48+
case VK_LO:
49+
return Value & 0xffff;
50+
case VK_HI:
51+
return (Value >> 16) & 0xffff;
52+
case VK_PPC_HA:
53+
return ((Value + 0x8000) >> 16) & 0xffff;
54+
case VK_HIGH:
55+
return (Value >> 16) & 0xffff;
56+
case VK_HIGHA:
57+
return ((Value + 0x8000) >> 16) & 0xffff;
58+
case VK_HIGHER:
59+
return (Value >> 32) & 0xffff;
60+
case VK_HIGHERA:
61+
return ((Value + 0x8000) >> 32) & 0xffff;
62+
case VK_HIGHEST:
63+
return (Value >> 48) & 0xffff;
64+
case VK_HIGHESTA:
65+
return ((Value + 0x8000) >> 48) & 0xffff;
66+
default:
67+
return {};
68+
}
6969
}
7070

7171
bool PPCMCExpr::evaluateAsRelocatableImpl(MCValue &Res, const MCAssembler *Asm,

‎llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCExpr.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ class PPCMCExpr : public MCTargetExpr {
2121
VK_PPC_None,
2222
// We currently use both MCSymbolRefExpr::VariantKind and
2323
// PPCMCExpr::VariantKind. Start at a larger number to avoid conflicts.
24-
VK_PPC_LO = 200,
25-
VK_PPC_HI,
24+
VK_LO = 200,
25+
VK_HI,
2626
VK_PPC_HA,
27-
VK_PPC_HIGH,
28-
VK_PPC_HIGHA,
29-
VK_PPC_HIGHER,
30-
VK_PPC_HIGHERA,
31-
VK_PPC_HIGHEST,
32-
VK_PPC_HIGHESTA
27+
VK_HIGH,
28+
VK_HIGHA,
29+
VK_HIGHER,
30+
VK_HIGHERA,
31+
VK_HIGHEST,
32+
VK_HIGHESTA,
3333
};
3434

3535
private:
@@ -49,11 +49,11 @@ class PPCMCExpr : public MCTargetExpr {
4949
MCContext &Ctx);
5050

5151
static const PPCMCExpr *createLo(const MCExpr *Expr, MCContext &Ctx) {
52-
return create(VK_PPC_LO, Expr, Ctx);
52+
return create(VK_LO, Expr, Ctx);
5353
}
5454

5555
static const PPCMCExpr *createHi(const MCExpr *Expr, MCContext &Ctx) {
56-
return create(VK_PPC_HI, Expr, Ctx);
56+
return create(VK_HI, Expr, Ctx);
5757
}
5858

5959
static const PPCMCExpr *createHa(const MCExpr *Expr, MCContext &Ctx) {

‎llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,7 @@ void PPCAsmPrinter::emitInstruction(const MachineInstr *MI) {
14041404
MCSymbol *GOTSymbol =
14051405
OutContext.getOrCreateSymbol(StringRef("_GLOBAL_OFFSET_TABLE_"));
14061406
const MCExpr *SymGotTlsL = PPCMCExpr::create(
1407-
PPCMCExpr::VK_PPC_LO, MCSymbolRefExpr::create(GOTSymbol, OutContext),
1407+
PPCMCExpr::VK_LO, MCSymbolRefExpr::create(GOTSymbol, OutContext),
14081408
OutContext);
14091409
const MCExpr *SymGotTlsHA = PPCMCExpr::create(
14101410
PPCMCExpr::VK_PPC_HA, MCSymbolRefExpr::create(GOTSymbol, OutContext),

0 commit comments

Comments
 (0)