Skip to content

Commit 88601d9

Browse files
MaskRayMaskRay
committed
[CSKY] Rename VK_CSKY_ to VK_ and VariantKind to Specifier
Similar to the simplification for RISCV and other targets.
1 parent ebcf1de commit 88601d9

File tree

9 files changed

+117
-117
lines changed

9 files changed

+117
-117
lines changed

‎llvm/lib/Target/CSKY/AsmParser/CSKYAsmParser.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -850,9 +850,9 @@ bool CSKYAsmParser::processLRW(MCInst &Inst, SMLoc IDLoc, MCStreamer &Out) {
850850
const MCExpr *AdjustExpr = nullptr;
851851
if (const CSKYMCExpr *CSKYExpr =
852852
dyn_cast<CSKYMCExpr>(Inst.getOperand(1).getExpr())) {
853-
if (CSKYExpr->getKind() == CSKYMCExpr::VK_CSKY_TLSGD ||
854-
CSKYExpr->getKind() == CSKYMCExpr::VK_CSKY_TLSIE ||
855-
CSKYExpr->getKind() == CSKYMCExpr::VK_CSKY_TLSLDM) {
853+
if (CSKYExpr->getKind() == CSKYMCExpr::VK_TLSGD ||
854+
CSKYExpr->getKind() == CSKYMCExpr::VK_TLSIE ||
855+
CSKYExpr->getKind() == CSKYMCExpr::VK_TLSLDM) {
856856
MCSymbol *Dot = getContext().createNamedTempSymbol();
857857
Out.emitLabel(Dot);
858858
AdjustExpr = MCSymbolRefExpr::create(Dot, getContext());
@@ -1172,25 +1172,25 @@ ParseStatus CSKYAsmParser::parseCSKYSymbol(OperandVector &Operands) {
11721172
if (getParser().parseIdentifier(Identifier))
11731173
return Error(getLoc(), "unknown identifier");
11741174

1175-
CSKYMCExpr::VariantKind Kind = CSKYMCExpr::VK_CSKY_None;
1175+
CSKYMCExpr::Specifier Kind = CSKYMCExpr::VK_None;
11761176
if (Identifier.consume_back("@GOT"))
1177-
Kind = CSKYMCExpr::VK_CSKY_GOT;
1177+
Kind = CSKYMCExpr::VK_GOT;
11781178
else if (Identifier.consume_back("@GOTOFF"))
1179-
Kind = CSKYMCExpr::VK_CSKY_GOTOFF;
1179+
Kind = CSKYMCExpr::VK_GOTOFF;
11801180
else if (Identifier.consume_back("@PLT"))
1181-
Kind = CSKYMCExpr::VK_CSKY_PLT;
1181+
Kind = CSKYMCExpr::VK_PLT;
11821182
else if (Identifier.consume_back("@GOTPC"))
1183-
Kind = CSKYMCExpr::VK_CSKY_GOTPC;
1183+
Kind = CSKYMCExpr::VK_GOTPC;
11841184
else if (Identifier.consume_back("@TLSGD32"))
1185-
Kind = CSKYMCExpr::VK_CSKY_TLSGD;
1185+
Kind = CSKYMCExpr::VK_TLSGD;
11861186
else if (Identifier.consume_back("@GOTTPOFF"))
1187-
Kind = CSKYMCExpr::VK_CSKY_TLSIE;
1187+
Kind = CSKYMCExpr::VK_TLSIE;
11881188
else if (Identifier.consume_back("@TPOFF"))
1189-
Kind = CSKYMCExpr::VK_CSKY_TLSLE;
1189+
Kind = CSKYMCExpr::VK_TLSLE;
11901190
else if (Identifier.consume_back("@TLSLDM32"))
1191-
Kind = CSKYMCExpr::VK_CSKY_TLSLDM;
1191+
Kind = CSKYMCExpr::VK_TLSLDM;
11921192
else if (Identifier.consume_back("@TLSLDO32"))
1193-
Kind = CSKYMCExpr::VK_CSKY_TLSLDO;
1193+
Kind = CSKYMCExpr::VK_TLSLDO;
11941194

11951195
MCSymbol *Sym = getContext().getInlineAsmLabel(Identifier);
11961196

@@ -1210,7 +1210,7 @@ ParseStatus CSKYAsmParser::parseCSKYSymbol(OperandVector &Operands) {
12101210
MCBinaryExpr::Opcode Opcode;
12111211
switch (getLexer().getKind()) {
12121212
default:
1213-
if (Kind != CSKYMCExpr::VK_CSKY_None)
1213+
if (Kind != CSKYMCExpr::VK_None)
12141214
Res = CSKYMCExpr::create(Res, Kind, getContext());
12151215

12161216
Operands.push_back(CSKYOperand::createImm(Res, S, E));
@@ -1258,11 +1258,11 @@ ParseStatus CSKYAsmParser::parseDataSymbol(OperandVector &Operands) {
12581258
if (getParser().parseIdentifier(Identifier))
12591259
return Error(getLoc(), "unknown identifier " + Identifier);
12601260

1261-
CSKYMCExpr::VariantKind Kind = CSKYMCExpr::VK_CSKY_None;
1261+
CSKYMCExpr::Specifier Kind = CSKYMCExpr::VK_None;
12621262
if (Identifier.consume_back("@GOT"))
1263-
Kind = CSKYMCExpr::VK_CSKY_GOT_IMM18_BY4;
1263+
Kind = CSKYMCExpr::VK_GOT_IMM18_BY4;
12641264
else if (Identifier.consume_back("@PLT"))
1265-
Kind = CSKYMCExpr::VK_CSKY_PLT_IMM18_BY4;
1265+
Kind = CSKYMCExpr::VK_PLT_IMM18_BY4;
12661266

12671267
MCSymbol *Sym = getContext().getInlineAsmLabel(Identifier);
12681268

@@ -1288,7 +1288,7 @@ ParseStatus CSKYAsmParser::parseDataSymbol(OperandVector &Operands) {
12881288

12891289
getLexer().Lex(); // Eat ']'.
12901290

1291-
if (Kind != CSKYMCExpr::VK_CSKY_None)
1291+
if (Kind != CSKYMCExpr::VK_None)
12921292
Res = CSKYMCExpr::create(Res, Kind, getContext());
12931293

12941294
Operands.push_back(CSKYOperand::createConstpoolOp(Res, S, E));

‎llvm/lib/Target/CSKY/CSKYAsmPrinter.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,25 +168,25 @@ void CSKYAsmPrinter::emitInstruction(const MachineInstr *MI) {
168168

169169
// Convert a CSKY-specific constant pool modifier into the associated
170170
// MCSymbolRefExpr variant kind.
171-
static CSKYMCExpr::VariantKind
171+
static CSKYMCExpr::Specifier
172172
getModifierVariantKind(CSKYCP::CSKYCPModifier Modifier) {
173173
switch (Modifier) {
174174
case CSKYCP::NO_MOD:
175-
return CSKYMCExpr::VK_CSKY_None;
175+
return CSKYMCExpr::VK_None;
176176
case CSKYCP::ADDR:
177-
return CSKYMCExpr::VK_CSKY_ADDR;
177+
return CSKYMCExpr::VK_ADDR;
178178
case CSKYCP::GOT:
179-
return CSKYMCExpr::VK_CSKY_GOT;
179+
return CSKYMCExpr::VK_GOT;
180180
case CSKYCP::GOTOFF:
181-
return CSKYMCExpr::VK_CSKY_GOTOFF;
181+
return CSKYMCExpr::VK_GOTOFF;
182182
case CSKYCP::PLT:
183-
return CSKYMCExpr::VK_CSKY_PLT;
183+
return CSKYMCExpr::VK_PLT;
184184
case CSKYCP::TLSGD:
185-
return CSKYMCExpr::VK_CSKY_TLSGD;
185+
return CSKYMCExpr::VK_TLSGD;
186186
case CSKYCP::TLSLE:
187-
return CSKYMCExpr::VK_CSKY_TLSLE;
187+
return CSKYMCExpr::VK_TLSLE;
188188
case CSKYCP::TLSIE:
189-
return CSKYMCExpr::VK_CSKY_TLSIE;
189+
return CSKYMCExpr::VK_TLSIE;
190190
}
191191
llvm_unreachable("Invalid CSKYCPModifier!");
192192
}

‎llvm/lib/Target/CSKY/CSKYMCInstLower.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@ void CSKYMCInstLower::Lower(const MachineInstr *MI, MCInst &OutMI) const {
3636

3737
MCOperand CSKYMCInstLower::lowerSymbolOperand(const MachineOperand &MO,
3838
MCSymbol *Sym) const {
39-
CSKYMCExpr::VariantKind Kind;
39+
CSKYMCExpr::Specifier Spec;
4040
MCContext &Ctx = Printer.OutContext;
4141

4242
switch (MO.getTargetFlags()) {
4343
default:
4444
llvm_unreachable("Unknown target flag.");
4545
case CSKYII::MO_None:
46-
Kind = CSKYMCExpr::VK_CSKY_None;
46+
Spec = CSKYMCExpr::VK_None;
4747
break;
4848
case CSKYII::MO_GOT32:
49-
Kind = CSKYMCExpr::VK_CSKY_GOT;
49+
Spec = CSKYMCExpr::VK_GOT;
5050
break;
5151
case CSKYII::MO_GOTOFF:
52-
Kind = CSKYMCExpr::VK_CSKY_GOTOFF;
52+
Spec = CSKYMCExpr::VK_GOTOFF;
5353
break;
5454
case CSKYII::MO_ADDR32:
55-
Kind = CSKYMCExpr::VK_CSKY_ADDR;
55+
Spec = CSKYMCExpr::VK_ADDR;
5656
break;
5757
case CSKYII::MO_PLT32:
58-
Kind = CSKYMCExpr::VK_CSKY_PLT;
58+
Spec = CSKYMCExpr::VK_PLT;
5959
break;
6060
case CSKYII::MO_ADDR_HI16:
61-
Kind = CSKYMCExpr::VK_CSKY_ADDR_HI16;
61+
Spec = CSKYMCExpr::VK_ADDR_HI16;
6262
break;
6363
case CSKYII::MO_ADDR_LO16:
64-
Kind = CSKYMCExpr::VK_CSKY_ADDR_LO16;
64+
Spec = CSKYMCExpr::VK_ADDR_LO16;
6565
break;
6666
}
6767
const MCExpr *ME = MCSymbolRefExpr::create(Sym, Ctx);
6868

69-
if (Kind != CSKYMCExpr::VK_CSKY_None)
70-
ME = CSKYMCExpr::create(ME, Kind, Ctx);
69+
if (Spec != CSKYMCExpr::VK_None)
70+
ME = CSKYMCExpr::create(ME, Spec, Ctx);
7171

7272
return MCOperand::createExpr(ME);
7373
}

‎llvm/lib/Target/CSKY/MCTargetDesc/CSKYELFObjectWriter.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,27 @@ unsigned CSKYELFObjectWriter::getRelocType(MCContext &Ctx,
8080
case FK_Data_4:
8181
if (Expr->getKind() == MCExpr::Target) {
8282
auto TK = cast<CSKYMCExpr>(Expr)->getKind();
83-
if (TK == CSKYMCExpr::VK_CSKY_ADDR)
83+
if (TK == CSKYMCExpr::VK_ADDR)
8484
return ELF::R_CKCORE_ADDR32;
85-
if (TK == CSKYMCExpr::VK_CSKY_GOT)
85+
if (TK == CSKYMCExpr::VK_GOT)
8686
return ELF::R_CKCORE_GOT32;
87-
if (TK == CSKYMCExpr::VK_CSKY_GOTOFF)
87+
if (TK == CSKYMCExpr::VK_GOTOFF)
8888
return ELF::R_CKCORE_GOTOFF;
89-
if (TK == CSKYMCExpr::VK_CSKY_PLT)
89+
if (TK == CSKYMCExpr::VK_PLT)
9090
return ELF::R_CKCORE_PLT32;
91-
if (TK == CSKYMCExpr::VK_CSKY_TLSIE)
91+
if (TK == CSKYMCExpr::VK_TLSIE)
9292
return ELF::R_CKCORE_TLS_IE32;
93-
if (TK == CSKYMCExpr::VK_CSKY_TLSLE)
93+
if (TK == CSKYMCExpr::VK_TLSLE)
9494
return ELF::R_CKCORE_TLS_LE32;
95-
if (TK == CSKYMCExpr::VK_CSKY_TLSGD)
95+
if (TK == CSKYMCExpr::VK_TLSGD)
9696
return ELF::R_CKCORE_TLS_GD32;
97-
if (TK == CSKYMCExpr::VK_CSKY_TLSLDM)
97+
if (TK == CSKYMCExpr::VK_TLSLDM)
9898
return ELF::R_CKCORE_TLS_LDM32;
99-
if (TK == CSKYMCExpr::VK_CSKY_TLSLDO)
99+
if (TK == CSKYMCExpr::VK_TLSLDO)
100100
return ELF::R_CKCORE_TLS_LDO32;
101-
if (TK == CSKYMCExpr::VK_CSKY_GOTPC)
101+
if (TK == CSKYMCExpr::VK_GOTPC)
102102
return ELF::R_CKCORE_GOTPC;
103-
if (TK == CSKYMCExpr::VK_CSKY_None)
103+
if (TK == CSKYMCExpr::VK_None)
104104
return ELF::R_CKCORE_ADDR32;
105105

106106
LLVM_DEBUG(dbgs() << "Unknown FK_Data_4 TK = " << TK);

‎llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCCodeEmitter.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -298,23 +298,23 @@ MCFixupKind CSKYMCCodeEmitter::getTargetFixup(const MCExpr *Expr) const {
298298
switch (CSKYExpr->getKind()) {
299299
default:
300300
llvm_unreachable("Unhandled fixup kind!");
301-
case CSKYMCExpr::VK_CSKY_ADDR:
301+
case CSKYMCExpr::VK_ADDR:
302302
return MCFixupKind(CSKY::fixup_csky_addr32);
303-
case CSKYMCExpr::VK_CSKY_ADDR_HI16:
303+
case CSKYMCExpr::VK_ADDR_HI16:
304304
return MCFixupKind(CSKY::fixup_csky_addr_hi16);
305-
case CSKYMCExpr::VK_CSKY_ADDR_LO16:
305+
case CSKYMCExpr::VK_ADDR_LO16:
306306
return MCFixupKind(CSKY::fixup_csky_addr_lo16);
307-
case CSKYMCExpr::VK_CSKY_GOT:
307+
case CSKYMCExpr::VK_GOT:
308308
return MCFixupKind(CSKY::fixup_csky_got32);
309-
case CSKYMCExpr::VK_CSKY_GOTPC:
309+
case CSKYMCExpr::VK_GOTPC:
310310
return MCFixupKind(CSKY::fixup_csky_gotpc);
311-
case CSKYMCExpr::VK_CSKY_GOTOFF:
311+
case CSKYMCExpr::VK_GOTOFF:
312312
return MCFixupKind(CSKY::fixup_csky_gotoff);
313-
case CSKYMCExpr::VK_CSKY_PLT:
313+
case CSKYMCExpr::VK_PLT:
314314
return MCFixupKind(CSKY::fixup_csky_plt32);
315-
case CSKYMCExpr::VK_CSKY_PLT_IMM18_BY4:
315+
case CSKYMCExpr::VK_PLT_IMM18_BY4:
316316
return MCFixupKind(CSKY::fixup_csky_plt_imm18_scale4);
317-
case CSKYMCExpr::VK_CSKY_GOT_IMM18_BY4:
317+
case CSKYMCExpr::VK_GOT_IMM18_BY4:
318318
return MCFixupKind(CSKY::fixup_csky_got_imm18_scale4);
319319
}
320320
}

‎llvm/lib/Target/CSKY/MCTargetDesc/CSKYMCExpr.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,41 @@ using namespace llvm;
1919

2020
#define DEBUG_TYPE "csky-mc-expr"
2121

22-
const CSKYMCExpr *CSKYMCExpr::create(const MCExpr *Expr, VariantKind Kind,
22+
const CSKYMCExpr *CSKYMCExpr::create(const MCExpr *Expr, Specifier Kind,
2323
MCContext &Ctx) {
24-
return new (Ctx) CSKYMCExpr(Kind, Expr);
24+
return new (Ctx) CSKYMCExpr(Expr, Kind);
2525
}
2626

27-
StringRef CSKYMCExpr::getVariantKindName(VariantKind Kind) {
27+
StringRef CSKYMCExpr::getVariantKindName(Specifier Kind) {
2828
switch (Kind) {
2929
default:
3030
llvm_unreachable("Invalid ELF symbol kind");
31-
case VK_CSKY_None:
32-
case VK_CSKY_ADDR:
31+
case VK_None:
32+
case VK_ADDR:
3333
return "";
34-
case VK_CSKY_ADDR_HI16:
34+
case VK_ADDR_HI16:
3535
return "@HI16";
36-
case VK_CSKY_ADDR_LO16:
36+
case VK_ADDR_LO16:
3737
return "@LO16";
38-
case VK_CSKY_GOT_IMM18_BY4:
39-
case VK_CSKY_GOT:
38+
case VK_GOT_IMM18_BY4:
39+
case VK_GOT:
4040
return "@GOT";
41-
case VK_CSKY_GOTPC:
41+
case VK_GOTPC:
4242
return "@GOTPC";
43-
case VK_CSKY_GOTOFF:
43+
case VK_GOTOFF:
4444
return "@GOTOFF";
45-
case VK_CSKY_PLT_IMM18_BY4:
46-
case VK_CSKY_PLT:
45+
case VK_PLT_IMM18_BY4:
46+
case VK_PLT:
4747
return "@PLT";
48-
case VK_CSKY_TLSLE:
48+
case VK_TLSLE:
4949
return "@TPOFF";
50-
case VK_CSKY_TLSIE:
50+
case VK_TLSIE:
5151
return "@GOTTPOFF";
52-
case VK_CSKY_TLSGD:
52+
case VK_TLSGD:
5353
return "@TLSGD32";
54-
case VK_CSKY_TLSLDO:
54+
case VK_TLSLDO:
5555
return "@TLSLDO32";
56-
case VK_CSKY_TLSLDM:
56+
case VK_TLSLDM:
5757
return "@TLSLDM32";
5858
}
5959
}
@@ -100,9 +100,9 @@ void CSKYMCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const {
100100
switch (getKind()) {
101101
default:
102102
return;
103-
case VK_CSKY_TLSLE:
104-
case VK_CSKY_TLSIE:
105-
case VK_CSKY_TLSGD:
103+
case VK_TLSLE:
104+
case VK_TLSIE:
105+
case VK_TLSGD:
106106
break;
107107
}
108108

@@ -119,17 +119,17 @@ bool CSKYMCExpr::evaluateAsRelocatableImpl(MCValue &Res,
119119
switch (getKind()) {
120120
default:
121121
return true;
122-
case VK_CSKY_GOT:
123-
case VK_CSKY_GOT_IMM18_BY4:
124-
case VK_CSKY_GOTPC:
125-
case VK_CSKY_GOTOFF:
126-
case VK_CSKY_PLT:
127-
case VK_CSKY_PLT_IMM18_BY4:
128-
case VK_CSKY_TLSIE:
129-
case VK_CSKY_TLSLE:
130-
case VK_CSKY_TLSGD:
131-
case VK_CSKY_TLSLDO:
132-
case VK_CSKY_TLSLDM:
122+
case VK_GOT:
123+
case VK_GOT_IMM18_BY4:
124+
case VK_GOTPC:
125+
case VK_GOTOFF:
126+
case VK_PLT:
127+
case VK_PLT_IMM18_BY4:
128+
case VK_TLSIE:
129+
case VK_TLSLE:
130+
case VK_TLSGD:
131+
case VK_TLSLDO:
132+
case VK_TLSLDM:
133133
return false;
134134
}
135135
}

0 commit comments

Comments
 (0)