Skip to content

Commit 27e6561

Browse files
committed
[Sparc] Use MCRegister. NFC
1 parent 22d65d8 commit 27e6561

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ class SparcOperand : public MCParsedAsmOperand {
525525
}
526526

527527
static bool MorphToIntPairReg(SparcOperand &Op) {
528-
unsigned Reg = Op.getReg();
528+
MCRegister Reg = Op.getReg();
529529
assert(Op.Reg.Kind == rk_IntReg);
530530
unsigned regIdx = 32;
531531
if (Reg >= Sparc::G0 && Reg <= Sparc::G7)
@@ -544,7 +544,7 @@ class SparcOperand : public MCParsedAsmOperand {
544544
}
545545

546546
static bool MorphToDoubleReg(SparcOperand &Op) {
547-
unsigned Reg = Op.getReg();
547+
MCRegister Reg = Op.getReg();
548548
assert(Op.Reg.Kind == rk_FloatReg);
549549
unsigned regIdx = Reg - Sparc::F0;
550550
if (regIdx % 2 || regIdx > 31)
@@ -555,7 +555,7 @@ class SparcOperand : public MCParsedAsmOperand {
555555
}
556556

557557
static bool MorphToQuadReg(SparcOperand &Op) {
558-
unsigned Reg = Op.getReg();
558+
MCRegister Reg = Op.getReg();
559559
unsigned regIdx = 0;
560560
switch (Op.Reg.Kind) {
561561
default: llvm_unreachable("Unexpected register kind!");
@@ -578,7 +578,7 @@ class SparcOperand : public MCParsedAsmOperand {
578578
}
579579

580580
static bool MorphToCoprocPairReg(SparcOperand &Op) {
581-
unsigned Reg = Op.getReg();
581+
MCRegister Reg = Op.getReg();
582582
assert(Op.Reg.Kind == rk_CoprocReg);
583583
unsigned regIdx = 32;
584584
if (Reg >= Sparc::C0 && Reg <= Sparc::C31)
@@ -592,7 +592,7 @@ class SparcOperand : public MCParsedAsmOperand {
592592

593593
static std::unique_ptr<SparcOperand>
594594
MorphToMEMrr(unsigned Base, std::unique_ptr<SparcOperand> Op) {
595-
unsigned offsetReg = Op->getReg();
595+
MCRegister offsetReg = Op->getReg();
596596
Op->Kind = k_MemoryReg;
597597
Op->Mem.Base = Base;
598598
Op->Mem.OffsetReg = offsetReg;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ bool SparcInstPrinter::printSparcAliasInstr(const MCInst *MI,
6666
return false;
6767
if (!MI->getOperand(0).isReg())
6868
return false;
69-
switch (MI->getOperand(0).getReg()) {
69+
switch (MI->getOperand(0).getReg().id()) {
7070
default: return false;
7171
case SP::G0: // jmp $addr | ret | retl
7272
if (MI->getOperand(2).isImm() &&
7373
MI->getOperand(2).getImm() == 8) {
74-
switch(MI->getOperand(1).getReg()) {
74+
switch (MI->getOperand(1).getReg().id()) {
7575
default: break;
7676
case SP::I7: O << "\tret"; return true;
7777
case SP::O7: O << "\tretl"; return true;
@@ -115,7 +115,7 @@ void SparcInstPrinter::printOperand(const MCInst *MI, int opNum,
115115
const MCOperand &MO = MI->getOperand (opNum);
116116

117117
if (MO.isReg()) {
118-
unsigned Reg = MO.getReg();
118+
MCRegister Reg = MO.getReg();
119119
if (isV9(STI))
120120
printRegName(O, Reg, SP::RegNamesStateReg);
121121
else

0 commit comments

Comments
 (0)