@@ -86,7 +86,7 @@ struct BPFOperand : public MCParsedAsmOperand {
86
86
} Kind;
87
87
88
88
struct RegOp {
89
- unsigned RegNum;
89
+ MCRegister RegNum;
90
90
};
91
91
92
92
struct ImmOp {
@@ -206,10 +206,10 @@ struct BPFOperand : public MCParsedAsmOperand {
206
206
return Op;
207
207
}
208
208
209
- static std::unique_ptr<BPFOperand> createReg (unsigned RegNo , SMLoc S,
209
+ static std::unique_ptr<BPFOperand> createReg (MCRegister Reg , SMLoc S,
210
210
SMLoc E) {
211
211
auto Op = std::make_unique<BPFOperand>(Register);
212
- Op->Reg .RegNum = RegNo ;
212
+ Op->Reg .RegNum = Reg ;
213
213
Op->StartLoc = S;
214
214
Op->EndLoc = E;
215
215
return Op;
@@ -447,13 +447,13 @@ ParseStatus BPFAsmParser::parseRegister(OperandVector &Operands) {
447
447
return ParseStatus::NoMatch;
448
448
case AsmToken::Identifier:
449
449
StringRef Name = getLexer ().getTok ().getIdentifier ();
450
- unsigned RegNo = MatchRegisterName (Name);
450
+ MCRegister Reg = MatchRegisterName (Name);
451
451
452
- if (RegNo == 0 )
452
+ if (!Reg )
453
453
return ParseStatus::NoMatch;
454
454
455
455
getLexer ().Lex ();
456
- Operands.push_back (BPFOperand::createReg (RegNo , S, E));
456
+ Operands.push_back (BPFOperand::createReg (Reg , S, E));
457
457
}
458
458
return ParseStatus::Success;
459
459
}
@@ -487,12 +487,12 @@ ParseStatus BPFAsmParser::parseImmediate(OperandVector &Operands) {
487
487
bool BPFAsmParser::parseInstruction (ParseInstructionInfo &Info, StringRef Name,
488
488
SMLoc NameLoc, OperandVector &Operands) {
489
489
// The first operand could be either register or actually an operator.
490
- unsigned RegNo = MatchRegisterName (Name);
490
+ MCRegister Reg = MatchRegisterName (Name);
491
491
492
- if (RegNo != 0 ) {
492
+ if (Reg ) {
493
493
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))
496
496
Operands.push_back (BPFOperand::createToken (Name, NameLoc));
497
497
else
498
498
return Error (NameLoc, " invalid register/token name" );
0 commit comments