Skip to content

Commit 4e884dd

Browse files
committed
SPARC: Remove SparcMCExpr.h
1 parent 382e3fd commit 4e884dd

File tree

10 files changed

+23
-50
lines changed

10 files changed

+23
-50
lines changed

llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
#include "MCTargetDesc/SparcMCExpr.h"
9+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1010
#include "MCTargetDesc/SparcMCTargetDesc.h"
1111
#include "TargetInfo/SparcTargetInfo.h"
1212
#include "llvm/ADT/SmallVector.h"
@@ -109,7 +109,8 @@ class SparcAsmParser : public MCTargetAsmParser {
109109
ParseStatus parseExpression(int64_t &Val);
110110

111111
// Helper function for dealing with %lo / %hi in PIC mode.
112-
const SparcMCExpr *adjustPICRelocation(uint16_t VK, const MCExpr *subExpr);
112+
const MCSpecifierExpr *adjustPICRelocation(uint16_t VK,
113+
const MCExpr *subExpr);
113114

114115
// Helper function to see if current token can start an expression.
115116
bool isPossibleExpression(const AsmToken &Token);
@@ -1642,7 +1643,7 @@ MCRegister SparcAsmParser::matchRegisterName(const AsmToken &Tok,
16421643
static bool hasGOTReference(const MCExpr *Expr) {
16431644
switch (Expr->getKind()) {
16441645
case MCExpr::Target:
1645-
if (const SparcMCExpr *SE = dyn_cast<SparcMCExpr>(Expr))
1646+
if (const MCSpecifierExpr *SE = dyn_cast<MCSpecifierExpr>(Expr))
16461647
return hasGOTReference(SE->getSubExpr());
16471648
break;
16481649

@@ -1668,8 +1669,8 @@ static bool hasGOTReference(const MCExpr *Expr) {
16681669
return false;
16691670
}
16701671

1671-
const SparcMCExpr *SparcAsmParser::adjustPICRelocation(uint16_t RelType,
1672-
const MCExpr *subExpr) {
1672+
const MCSpecifierExpr *
1673+
SparcAsmParser::adjustPICRelocation(uint16_t RelType, const MCExpr *subExpr) {
16731674
// When in PIC mode, "%lo(...)" and "%hi(...)" behave differently.
16741675
// If the expression refers contains _GLOBAL_OFFSET_TABLE, it is
16751676
// actually a %pc10 or %pc22 relocation. Otherwise, they are interpreted

llvm/lib/Target/Sparc/MCTargetDesc/SparcELFObjectWriter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "MCTargetDesc/SparcFixupKinds.h"
10-
#include "MCTargetDesc/SparcMCExpr.h"
10+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1111
#include "MCTargetDesc/SparcMCTargetDesc.h"
1212
#include "llvm/MC/MCContext.h"
1313
#include "llvm/MC/MCELFObjectWriter.h"
@@ -72,7 +72,7 @@ unsigned SparcELFObjectWriter::getRelocType(const MCFixup &Fixup,
7272
if (mc::isRelocation(Fixup.getKind()))
7373
return Kind;
7474

75-
if (const SparcMCExpr *SExpr = dyn_cast<SparcMCExpr>(Fixup.getValue())) {
75+
if (const auto *SExpr = dyn_cast<MCSpecifierExpr>(Fixup.getValue())) {
7676
if (SExpr->getSpecifier() == ELF::R_SPARC_DISP32)
7777
return ELF::R_SPARC_DISP32;
7878
}

llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "SparcMCAsmInfo.h"
14-
#include "SparcMCExpr.h"
1514
#include "llvm/BinaryFormat/Dwarf.h"
1615
#include "llvm/BinaryFormat/ELF.h"
1716
#include "llvm/MC/MCExpr.h"

llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ class SparcELFMCAsmInfo : public MCAsmInfoELF {
3636
const MCSpecifierExpr &Expr) const override;
3737
};
3838

39+
namespace Sparc {
40+
uint16_t parseSpecifier(StringRef name);
41+
StringRef getSpecifierName(uint16_t S);
42+
} // namespace Sparc
43+
3944
} // end namespace llvm
4045

4146
#endif // LLVM_LIB_TARGET_SPARC_MCTARGETDESC_SPARCMCASMINFO_H

llvm/lib/Target/Sparc/MCTargetDesc/SparcMCCodeEmitter.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
#include "MCTargetDesc/SparcFixupKinds.h"
14-
#include "SparcMCExpr.h"
14+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1515
#include "SparcMCTargetDesc.h"
1616
#include "llvm/ADT/SmallVector.h"
1717
#include "llvm/ADT/Statistic.h"
@@ -134,7 +134,7 @@ getMachineOpValue(const MCInst &MI, const MCOperand &MO,
134134

135135
assert(MO.isExpr());
136136
const MCExpr *Expr = MO.getExpr();
137-
if (const SparcMCExpr *SExpr = dyn_cast<SparcMCExpr>(Expr)) {
137+
if (auto *SExpr = dyn_cast<MCSpecifierExpr>(Expr)) {
138138
Fixups.push_back(MCFixup::create(0, Expr, SExpr->getSpecifier()));
139139
return 0;
140140
}
@@ -164,7 +164,7 @@ unsigned SparcMCCodeEmitter::getSImm5OpValue(const MCInst &MI, unsigned OpNo,
164164
if (const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Expr))
165165
return CE->getValue();
166166

167-
if (const SparcMCExpr *SExpr = dyn_cast<SparcMCExpr>(Expr)) {
167+
if (auto *SExpr = dyn_cast<MCSpecifierExpr>(Expr)) {
168168
Fixups.push_back(MCFixup::create(0, Expr, SExpr->getSpecifier()));
169169
return 0;
170170
}
@@ -190,7 +190,7 @@ SparcMCCodeEmitter::getSImm13OpValue(const MCInst &MI, unsigned OpNo,
190190
if (const MCConstantExpr *CE = dyn_cast<MCConstantExpr>(Expr))
191191
return CE->getValue();
192192

193-
if (const SparcMCExpr *SExpr = dyn_cast<SparcMCExpr>(Expr)) {
193+
if (auto *SExpr = dyn_cast<MCSpecifierExpr>(Expr)) {
194194
Fixups.push_back(MCFixup::create(0, Expr, SExpr->getSpecifier()));
195195
return 0;
196196
}

llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
//
1212
//===----------------------------------------------------------------------===//
1313

14-
#include "SparcMCExpr.h"
14+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1515
#include "llvm/BinaryFormat/ELF.h"
1616
#include "llvm/MC/MCAssembler.h"
1717
#include "llvm/MC/MCContext.h"

llvm/lib/Target/Sparc/MCTargetDesc/SparcMCExpr.h

Lines changed: 0 additions & 32 deletions
This file was deleted.

llvm/lib/Target/Sparc/SparcAsmPrinter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "MCTargetDesc/SparcInstPrinter.h"
15-
#include "MCTargetDesc/SparcMCExpr.h"
15+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1616
#include "MCTargetDesc/SparcMCTargetDesc.h"
1717
#include "MCTargetDesc/SparcTargetStreamer.h"
1818
#include "Sparc.h"
@@ -82,7 +82,7 @@ class SparcAsmPrinter : public AsmPrinter {
8282
static MCOperand createSparcMCOperand(uint16_t Kind, MCSymbol *Sym,
8383
MCContext &OutContext) {
8484
const MCSymbolRefExpr *MCSym = MCSymbolRefExpr::create(Sym, OutContext);
85-
const SparcMCExpr *expr = MCSpecifierExpr::create(MCSym, Kind, OutContext);
85+
auto *expr = MCSpecifierExpr::create(MCSym, Kind, OutContext);
8686
return MCOperand::createExpr(expr);
8787
}
8888
static MCOperand createPCXCallOP(MCSymbol *Label,
@@ -101,7 +101,7 @@ static MCOperand createPCXRelExprOp(uint16_t Spec, MCSymbol *GOTLabel,
101101

102102
const MCBinaryExpr *Sub = MCBinaryExpr::createSub(Cur, Start, OutContext);
103103
const MCBinaryExpr *Add = MCBinaryExpr::createAdd(GOT, Sub, OutContext);
104-
const SparcMCExpr *expr = MCSpecifierExpr::create(Add, Spec, OutContext);
104+
auto *expr = MCSpecifierExpr::create(Add, Spec, OutContext);
105105
return MCOperand::createExpr(expr);
106106
}
107107

llvm/lib/Target/Sparc/SparcISelLowering.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//===----------------------------------------------------------------------===//
1313

1414
#include "SparcISelLowering.h"
15-
#include "MCTargetDesc/SparcMCExpr.h"
15+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1616
#include "MCTargetDesc/SparcMCTargetDesc.h"
1717
#include "SparcMachineFunctionInfo.h"
1818
#include "SparcRegisterInfo.h"

llvm/lib/Target/Sparc/SparcTargetObjectFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "SparcTargetObjectFile.h"
10-
#include "MCTargetDesc/SparcMCExpr.h"
10+
#include "MCTargetDesc/SparcMCAsmInfo.h"
1111
#include "llvm/BinaryFormat/Dwarf.h"
1212
#include "llvm/BinaryFormat/ELF.h"
1313
#include "llvm/CodeGen/MachineModuleInfoImpls.h"

0 commit comments

Comments
 (0)