@@ -154,7 +154,7 @@ struct CSKYOperand : public MCParsedAsmOperand {
154
154
} Kind;
155
155
156
156
struct RegOp {
157
- unsigned RegNum;
157
+ MCRegister RegNum;
158
158
};
159
159
160
160
struct ImmOp {
@@ -166,19 +166,19 @@ struct CSKYOperand : public MCParsedAsmOperand {
166
166
};
167
167
168
168
struct RegSeqOp {
169
- unsigned RegNumFrom;
170
- unsigned RegNumTo;
169
+ MCRegister RegNumFrom;
170
+ MCRegister RegNumTo;
171
171
};
172
172
173
173
struct RegListOp {
174
- unsigned List1From = 0 ;
175
- unsigned List1To = 0 ;
176
- unsigned List2From = 0 ;
177
- unsigned List2To = 0 ;
178
- unsigned List3From = 0 ;
179
- unsigned List3To = 0 ;
180
- unsigned List4From = 0 ;
181
- unsigned List4To = 0 ;
174
+ MCRegister List1From;
175
+ MCRegister List1To;
176
+ MCRegister List2From;
177
+ MCRegister List2To;
178
+ MCRegister List3From;
179
+ MCRegister List3To;
180
+ MCRegister List4From;
181
+ MCRegister List4To;
182
182
};
183
183
184
184
SMLoc StartLoc, EndLoc;
@@ -405,9 +405,9 @@ struct CSKYOperand : public MCParsedAsmOperand {
405
405
return Reg.RegNum ;
406
406
}
407
407
408
- std::pair<unsigned , unsigned > getRegSeq () const {
408
+ std::pair<MCRegister, MCRegister > getRegSeq () const {
409
409
assert (Kind == RegisterSeq && " Invalid type access!" );
410
- return std::pair< unsigned , unsigned >( RegSeq.RegNumFrom , RegSeq.RegNumTo ) ;
410
+ return { RegSeq.RegNumFrom , RegSeq.RegNumTo } ;
411
411
}
412
412
413
413
RegListOp getRegList () const {
@@ -478,7 +478,7 @@ struct CSKYOperand : public MCParsedAsmOperand {
478
478
return Op;
479
479
}
480
480
481
- static std::unique_ptr<CSKYOperand> createReg (unsigned RegNo, SMLoc S,
481
+ static std::unique_ptr<CSKYOperand> createReg (MCRegister RegNo, SMLoc S,
482
482
SMLoc E) {
483
483
auto Op = std::make_unique<CSKYOperand>(Register);
484
484
Op->Reg .RegNum = RegNo;
@@ -487,8 +487,8 @@ struct CSKYOperand : public MCParsedAsmOperand {
487
487
return Op;
488
488
}
489
489
490
- static std::unique_ptr<CSKYOperand> createRegSeq ( unsigned RegNoFrom,
491
- unsigned RegNoTo, SMLoc S) {
490
+ static std::unique_ptr<CSKYOperand>
491
+ createRegSeq (MCRegister RegNoFrom, MCRegister RegNoTo, SMLoc S) {
492
492
auto Op = std::make_unique<CSKYOperand>(RegisterSeq);
493
493
Op->RegSeq .RegNumFrom = RegNoFrom;
494
494
Op->RegSeq .RegNumTo = RegNoTo;
@@ -498,7 +498,7 @@ struct CSKYOperand : public MCParsedAsmOperand {
498
498
}
499
499
500
500
static std::unique_ptr<CSKYOperand>
501
- createRegList (SmallVector<unsigned , 4 > reglist, SMLoc S) {
501
+ createRegList (const SmallVector<MCRegister , 4 > & reglist, SMLoc S) {
502
502
auto Op = std::make_unique<CSKYOperand>(RegisterList);
503
503
Op->RegList .List1From = 0 ;
504
504
Op->RegList .List1To = 0 ;
@@ -1445,9 +1445,7 @@ ParseStatus CSKYAsmParser::parseRegSeq(OperandVector &Operands) {
1445
1445
1446
1446
ParseStatus CSKYAsmParser::parseRegList (OperandVector &Operands) {
1447
1447
SMLoc S = getLoc ();
1448
-
1449
- SmallVector<unsigned , 4 > reglist;
1450
-
1448
+ SmallVector<MCRegister, 4 > reglist;
1451
1449
while (true ) {
1452
1450
1453
1451
if (!parseRegister (Operands).isSuccess ())
0 commit comments