Skip to content

Commit f3021e7

Browse files
MaskRayMaskRay
committed
ARM: Rename ARMMCExpr::VK_ to ARM::S_
Prepare for removing ARMMCExpr. Adopt the new naming convention (S_ instead of VK_; the relocation specifier was previously named `VariantKind`)) used by most other targets. Make ARMMCAsmInfo.h include ARMMCExpr.h and change .cpp files to include ARMMCAsmInfo.h. We will eventually remove ARMMCExpr.h.
1 parent 4f9e6ba commit f3021e7

12 files changed

+214
-200
lines changed

‎llvm/lib/Target/ARM/ARMAsmPrinter.cpp

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "ARMTargetMachine.h"
1919
#include "ARMTargetObjectFile.h"
2020
#include "MCTargetDesc/ARMInstPrinter.h"
21-
#include "MCTargetDesc/ARMMCExpr.h"
21+
#include "MCTargetDesc/ARMMCAsmInfo.h"
2222
#include "TargetInfo/ARMTargetInfo.h"
2323
#include "llvm/ADT/SmallString.h"
2424
#include "llvm/BinaryFormat/COFF.h"
@@ -92,8 +92,7 @@ void ARMAsmPrinter::emitXXStructor(const DataLayout &DL, const Constant *CV) {
9292

9393
const MCExpr *E = MCSymbolRefExpr::create(
9494
GetARMGVSymbol(GV, ARMII::MO_NO_FLAG),
95-
(Subtarget->isTargetELF() ? ARMMCExpr::VK_TARGET1 : ARMMCExpr::VK_None),
96-
OutContext);
95+
(Subtarget->isTargetELF() ? ARM::S_TARGET1 : ARM::S_None), OutContext);
9796

9897
OutStreamer->emitValue(E, Size);
9998
}
@@ -843,17 +842,17 @@ static MCSymbol *getPICLabel(StringRef Prefix, unsigned FunctionNumber,
843842
static uint8_t getModifierSpecifier(ARMCP::ARMCPModifier Modifier) {
844843
switch (Modifier) {
845844
case ARMCP::no_modifier:
846-
return ARMMCExpr::VK_None;
845+
return ARM::S_None;
847846
case ARMCP::TLSGD:
848-
return ARMMCExpr::VK_TLSGD;
847+
return ARM::S_TLSGD;
849848
case ARMCP::TPOFF:
850-
return ARMMCExpr::VK_TPOFF;
849+
return ARM::S_TPOFF;
851850
case ARMCP::GOTTPOFF:
852-
return ARMMCExpr::VK_GOTTPOFF;
851+
return ARM::S_GOTTPOFF;
853852
case ARMCP::SBREL:
854-
return ARMMCExpr::VK_SBREL;
853+
return ARM::S_SBREL;
855854
case ARMCP::GOT_PREL:
856-
return ARMMCExpr::VK_GOT_PREL;
855+
return ARM::S_GOT_PREL;
857856
case ARMCP::SECREL:
858857
return MCSymbolRefExpr::VK_SECREL;
859858
}

‎llvm/lib/Target/ARM/ARMMCInstLower.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "ARMSubtarget.h"
1919
#include "MCTargetDesc/ARMAddressingModes.h"
2020
#include "MCTargetDesc/ARMBaseInfo.h"
21-
#include "MCTargetDesc/ARMMCExpr.h"
21+
#include "MCTargetDesc/ARMMCAsmInfo.h"
2222
#include "llvm/ADT/APFloat.h"
2323
#include "llvm/CodeGen/MachineBasicBlock.h"
2424
#include "llvm/CodeGen/MachineInstr.h"
@@ -37,9 +37,9 @@ using namespace llvm;
3737

3838
MCOperand ARMAsmPrinter::GetSymbolRef(const MachineOperand &MO,
3939
const MCSymbol *Symbol) {
40-
auto Specifier = ARMMCExpr::VK_None;
40+
auto Specifier = ARM::S_None;
4141
if (MO.getTargetFlags() & ARMII::MO_SBREL)
42-
Specifier = ARMMCExpr::VK_SBREL;
42+
Specifier = ARM::S_SBREL;
4343

4444
const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, Specifier, OutContext);
4545
switch (MO.getTargetFlags() & ARMII::MO_OPTION_MASK) {

‎llvm/lib/Target/ARM/ARMTargetObjectFile.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "ARMTargetObjectFile.h"
1010
#include "ARMSubtarget.h"
1111
#include "ARMTargetMachine.h"
12-
#include "MCTargetDesc/ARMMCExpr.h"
12+
#include "MCTargetDesc/ARMMCAsmInfo.h"
1313
#include "llvm/BinaryFormat/Dwarf.h"
1414
#include "llvm/BinaryFormat/ELF.h"
1515
#include "llvm/MC/MCAsmInfo.h"
@@ -30,7 +30,7 @@ using namespace dwarf;
3030
//===----------------------------------------------------------------------===//
3131

3232
ARMElfTargetObjectFile::ARMElfTargetObjectFile() {
33-
PLTRelativeSpecifier = ARMMCExpr::VK_PREL31;
33+
PLTRelativeSpecifier = ARM::S_PREL31;
3434
SupportIndirectSymViaGOTPCRel = true;
3535
}
3636

@@ -68,14 +68,14 @@ const MCExpr *ARMElfTargetObjectFile::getIndirectSymViaGOTPCRel(
6868
int64_t Offset, MachineModuleInfo *MMI, MCStreamer &Streamer) const {
6969
int64_t FinalOffset = Offset + MV.getConstant();
7070
const MCExpr *Res =
71-
MCSymbolRefExpr::create(Sym, ARMMCExpr::VK_GOT_PREL, getContext());
71+
MCSymbolRefExpr::create(Sym, ARM::S_GOT_PREL, getContext());
7272
const MCExpr *Off = MCConstantExpr::create(FinalOffset, getContext());
7373
return MCBinaryExpr::createAdd(Res, Off, getContext());
7474
}
7575

7676
const MCExpr *ARMElfTargetObjectFile::
7777
getIndirectSymViaRWPI(const MCSymbol *Sym) const {
78-
return MCSymbolRefExpr::create(Sym, ARMMCExpr::VK_SBREL, getContext());
78+
return MCSymbolRefExpr::create(Sym, ARM::S_SBREL, getContext());
7979
}
8080

8181
const MCExpr *ARMElfTargetObjectFile::getTTypeGlobalReference(
@@ -87,13 +87,13 @@ const MCExpr *ARMElfTargetObjectFile::getTTypeGlobalReference(
8787

8888
assert(Encoding == DW_EH_PE_absptr && "Can handle absptr encoding only");
8989

90-
return MCSymbolRefExpr::create(TM.getSymbol(GV), ARMMCExpr::VK_TARGET2,
90+
return MCSymbolRefExpr::create(TM.getSymbol(GV), ARM::S_TARGET2,
9191
getContext());
9292
}
9393

9494
const MCExpr *ARMElfTargetObjectFile::
9595
getDebugThreadLocalSymbol(const MCSymbol *Sym) const {
96-
return MCSymbolRefExpr::create(Sym, ARMMCExpr::VK_TLSLDO, getContext());
96+
return MCSymbolRefExpr::create(Sym, ARM::S_TLSLDO, getContext());
9797
}
9898

9999
static bool isExecuteOnlyFunction(const GlobalObject *GO, SectionKind SK,

‎llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include "MCTargetDesc/ARMAddressingModes.h"
1212
#include "MCTargetDesc/ARMBaseInfo.h"
1313
#include "MCTargetDesc/ARMInstPrinter.h"
14-
#include "MCTargetDesc/ARMMCExpr.h"
14+
#include "MCTargetDesc/ARMMCAsmInfo.h"
1515
#include "MCTargetDesc/ARMMCTargetDesc.h"
1616
#include "TargetInfo/ARMTargetInfo.h"
1717
#include "Utils/ARMBaseInfo.h"
@@ -1327,8 +1327,8 @@ class ARMOperand : public MCParsedAsmOperand {
13271327
// We want to avoid matching :upper16: and :lower16: as we want these
13281328
// expressions to match in isImm0_65535Expr()
13291329
const ARMMCExpr *ARM16Expr = dyn_cast<ARMMCExpr>(getImm());
1330-
return (!ARM16Expr || (ARM16Expr->getSpecifier() != ARMMCExpr::VK_HI16 &&
1331-
ARM16Expr->getSpecifier() != ARMMCExpr::VK_LO16));
1330+
return (!ARM16Expr || (ARM16Expr->getSpecifier() != ARM::S_HI16 &&
1331+
ARM16Expr->getSpecifier() != ARM::S_LO16));
13321332
}
13331333
if (!isImm()) return false;
13341334
const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(getImm());
@@ -6473,7 +6473,7 @@ bool ARMAsmParser::parseImmExpr(int64_t &Out) {
64736473
// :upper8_15:, :upper0_7:, :lower8_15: and :lower0_7:
64746474
bool ARMAsmParser::parsePrefix(ARMMCExpr::Specifier &Spec) {
64756475
MCAsmParser &Parser = getParser();
6476-
Spec = ARMMCExpr::VK_None;
6476+
Spec = ARM::S_None;
64776477

64786478
// consume an optional '#' (GNU compatibility)
64796479
if (getLexer().is(AsmToken::Hash))
@@ -6498,12 +6498,12 @@ bool ARMAsmParser::parsePrefix(ARMMCExpr::Specifier &Spec) {
64986498
ARMMCExpr::Specifier Spec;
64996499
uint8_t SupportedFormats;
65006500
} PrefixEntries[] = {
6501-
{"upper16", ARMMCExpr::VK_HI16, COFF | ELF | MACHO},
6502-
{"lower16", ARMMCExpr::VK_LO16, COFF | ELF | MACHO},
6503-
{"upper8_15", ARMMCExpr::VK_HI_8_15, ELF},
6504-
{"upper0_7", ARMMCExpr::VK_HI_0_7, ELF},
6505-
{"lower8_15", ARMMCExpr::VK_LO_8_15, ELF},
6506-
{"lower0_7", ARMMCExpr::VK_LO_0_7, ELF},
6501+
{"upper16", ARM::S_HI16, COFF | ELF | MACHO},
6502+
{"lower16", ARM::S_LO16, COFF | ELF | MACHO},
6503+
{"upper8_15", ARM::S_HI_8_15, ELF},
6504+
{"upper0_7", ARM::S_HI_0_7, ELF},
6505+
{"lower8_15", ARM::S_LO_8_15, ELF},
6506+
{"lower0_7", ARM::S_LO_0_7, ELF},
65076507
};
65086508

65096509
StringRef IDVal = Parser.getTok().getIdentifier();
@@ -6880,10 +6880,10 @@ static bool isThumbI8Relocation(MCParsedAsmOperand &MCOp) {
68806880
if (!E)
68816881
return false;
68826882
const ARMMCExpr *ARM16Expr = dyn_cast<ARMMCExpr>(E);
6883-
if (ARM16Expr && (ARM16Expr->getSpecifier() == ARMMCExpr::VK_HI_8_15 ||
6884-
ARM16Expr->getSpecifier() == ARMMCExpr::VK_HI_0_7 ||
6885-
ARM16Expr->getSpecifier() == ARMMCExpr::VK_LO_8_15 ||
6886-
ARM16Expr->getSpecifier() == ARMMCExpr::VK_LO_0_7))
6883+
if (ARM16Expr && (ARM16Expr->getSpecifier() == ARM::S_HI_8_15 ||
6884+
ARM16Expr->getSpecifier() == ARM::S_HI_0_7 ||
6885+
ARM16Expr->getSpecifier() == ARM::S_LO_8_15 ||
6886+
ARM16Expr->getSpecifier() == ARM::S_LO_0_7))
68876887
return true;
68886888
return false;
68896889
}
@@ -8287,8 +8287,8 @@ bool ARMAsmParser::validateInstruction(MCInst &Inst,
82878287
const MCExpr *E = dyn_cast<MCExpr>(Op.getImm());
82888288
if (!E) break;
82898289
const ARMMCExpr *ARM16Expr = dyn_cast<ARMMCExpr>(E);
8290-
if (!ARM16Expr || (ARM16Expr->getSpecifier() != ARMMCExpr::VK_HI16 &&
8291-
ARM16Expr->getSpecifier() != ARMMCExpr::VK_LO16))
8290+
if (!ARM16Expr || (ARM16Expr->getSpecifier() != ARM::S_HI16 &&
8291+
ARM16Expr->getSpecifier() != ARM::S_LO16))
82928292
return Error(
82938293
Op.getStartLoc(),
82948294
"immediate expression for mov requires :lower16: or :upper16");
@@ -12437,7 +12437,7 @@ bool ARMAsmParser::parseDirectiveTLSDescSeq(SMLoc L) {
1243712437

1243812438
auto *Sym = getContext().getOrCreateSymbol(Parser.getTok().getIdentifier());
1243912439
const auto *SRE =
12440-
MCSymbolRefExpr::create(Sym, ARMMCExpr::VK_TLSDESCSEQ, getContext());
12440+
MCSymbolRefExpr::create(Sym, ARM::S_TLSDESCSEQ, getContext());
1244112441
Lex();
1244212442

1244312443
if (parseEOL())

‎llvm/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "MCTargetDesc/ARMAsmBackendELF.h"
1313
#include "MCTargetDesc/ARMAsmBackendWinCOFF.h"
1414
#include "MCTargetDesc/ARMFixupKinds.h"
15-
#include "MCTargetDesc/ARMMCExpr.h"
15+
#include "MCTargetDesc/ARMMCAsmInfo.h"
1616
#include "MCTargetDesc/ARMMCTargetDesc.h"
1717
#include "llvm/ADT/StringSwitch.h"
1818
#include "llvm/BinaryFormat/ELF.h"
@@ -619,7 +619,7 @@ unsigned ARMAsmBackend::adjustFixupValue(const MCAssembler &Asm,
619619
// Offset by 8 just as above.
620620
if (const MCSymbolRefExpr *SRE =
621621
dyn_cast<MCSymbolRefExpr>(Fixup.getValue()))
622-
if (SRE->getSpecifier() == ARMMCExpr::VK_TLSCALL)
622+
if (SRE->getSpecifier() == ARM::S_TLSCALL)
623623
return 0;
624624
return 0xffffff & (Value >> 2);
625625
case ARM::fixup_t2_uncondbranch: {
@@ -746,7 +746,7 @@ unsigned ARMAsmBackend::adjustFixupValue(const MCAssembler &Asm,
746746
uint32_t offset = (Value - 4) >> 2;
747747
if (const MCSymbolRefExpr *SRE =
748748
dyn_cast<MCSymbolRefExpr>(Fixup.getValue()))
749-
if (SRE->getSpecifier() == ARMMCExpr::VK_TLSCALL)
749+
if (SRE->getSpecifier() == ARM::S_TLSCALL)
750750
offset = 0;
751751
uint32_t signBit = (offset & 0x400000) >> 22;
752752
uint32_t I1Bit = (offset & 0x200000) >> 21;

0 commit comments

Comments
 (0)