Skip to content

Commit 886b2b2

Browse files
committed
[BPF] Use MCRegister. NFC
1 parent 2c8836c commit 886b2b2

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

llvm/lib/Target/BPF/AsmParser/BPFAsmParser.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ struct BPFOperand : public MCParsedAsmOperand {
8686
} Kind;
8787

8888
struct RegOp {
89-
unsigned RegNum;
89+
MCRegister RegNum;
9090
};
9191

9292
struct ImmOp {
@@ -206,10 +206,10 @@ struct BPFOperand : public MCParsedAsmOperand {
206206
return Op;
207207
}
208208

209-
static std::unique_ptr<BPFOperand> createReg(unsigned RegNo, SMLoc S,
209+
static std::unique_ptr<BPFOperand> createReg(MCRegister Reg, SMLoc S,
210210
SMLoc E) {
211211
auto Op = std::make_unique<BPFOperand>(Register);
212-
Op->Reg.RegNum = RegNo;
212+
Op->Reg.RegNum = Reg;
213213
Op->StartLoc = S;
214214
Op->EndLoc = E;
215215
return Op;
@@ -447,13 +447,13 @@ ParseStatus BPFAsmParser::parseRegister(OperandVector &Operands) {
447447
return ParseStatus::NoMatch;
448448
case AsmToken::Identifier:
449449
StringRef Name = getLexer().getTok().getIdentifier();
450-
unsigned RegNo = MatchRegisterName(Name);
450+
MCRegister Reg = MatchRegisterName(Name);
451451

452-
if (RegNo == 0)
452+
if (!Reg)
453453
return ParseStatus::NoMatch;
454454

455455
getLexer().Lex();
456-
Operands.push_back(BPFOperand::createReg(RegNo, S, E));
456+
Operands.push_back(BPFOperand::createReg(Reg, S, E));
457457
}
458458
return ParseStatus::Success;
459459
}
@@ -487,12 +487,12 @@ ParseStatus BPFAsmParser::parseImmediate(OperandVector &Operands) {
487487
bool BPFAsmParser::parseInstruction(ParseInstructionInfo &Info, StringRef Name,
488488
SMLoc NameLoc, OperandVector &Operands) {
489489
// The first operand could be either register or actually an operator.
490-
unsigned RegNo = MatchRegisterName(Name);
490+
MCRegister Reg = MatchRegisterName(Name);
491491

492-
if (RegNo != 0) {
492+
if (Reg) {
493493
SMLoc E = SMLoc::getFromPointer(NameLoc.getPointer() - 1);
494-
Operands.push_back(BPFOperand::createReg(RegNo, NameLoc, E));
495-
} else if (BPFOperand::isValidIdAtStart (Name))
494+
Operands.push_back(BPFOperand::createReg(Reg, NameLoc, E));
495+
} else if (BPFOperand::isValidIdAtStart(Name))
496496
Operands.push_back(BPFOperand::createToken(Name, NameLoc));
497497
else
498498
return Error(NameLoc, "invalid register/token name");

0 commit comments

Comments
 (0)