@@ -395,8 +395,8 @@ struct RISCVOperand final : public MCParsedAsmOperand {
395395 };
396396
397397 struct RegRegOp {
398- MCRegister Reg1 ;
399- MCRegister Reg2 ;
398+ MCRegister BaseReg ;
399+ MCRegister OffsetReg ;
400400 };
401401
402402 SMLoc StartLoc, EndLoc;
@@ -1043,8 +1043,8 @@ struct RISCVOperand final : public MCParsedAsmOperand {
10431043 OS << ' >' ;
10441044 break ;
10451045 case KindTy::RegReg:
1046- OS << " <RegReg: Reg1 " << RegName (RegReg.Reg1 );
1047- OS << " Reg2 " << RegName (RegReg.Reg2 );
1046+ OS << " <RegReg: BaseReg " << RegName (RegReg.BaseReg ) << " OffsetReg "
1047+ << RegName (RegReg.OffsetReg );
10481048 break ;
10491049 }
10501050 }
@@ -1129,11 +1129,11 @@ struct RISCVOperand final : public MCParsedAsmOperand {
11291129 return Op;
11301130 }
11311131
1132- static std::unique_ptr<RISCVOperand> createRegReg (MCRegister Reg1,
1133- MCRegister Reg2 , SMLoc S) {
1132+ static std::unique_ptr<RISCVOperand>
1133+ createRegReg (MCRegister BaseReg, MCRegister OffsetReg , SMLoc S) {
11341134 auto Op = std::make_unique<RISCVOperand>(KindTy::RegReg);
1135- Op->RegReg .Reg1 = Reg1 ;
1136- Op->RegReg .Reg2 = Reg2 ;
1135+ Op->RegReg .BaseReg = BaseReg ;
1136+ Op->RegReg .OffsetReg = OffsetReg ;
11371137 Op->StartLoc = S;
11381138 Op->EndLoc = S;
11391139 return Op;
@@ -1213,8 +1213,8 @@ struct RISCVOperand final : public MCParsedAsmOperand {
12131213
12141214 void addRegRegOperands (MCInst &Inst, unsigned N) const {
12151215 assert (N == 2 && " Invalid number of operands!" );
1216- Inst.addOperand (MCOperand::createReg (RegReg.Reg1 ));
1217- Inst.addOperand (MCOperand::createReg (RegReg.Reg2 ));
1216+ Inst.addOperand (MCOperand::createReg (RegReg.BaseReg ));
1217+ Inst.addOperand (MCOperand::createReg (RegReg.OffsetReg ));
12181218 }
12191219
12201220 void addStackAdjOperands (MCInst &Inst, unsigned N) const {
0 commit comments