@@ -506,9 +506,10 @@ class ARMAsmParser : public MCTargetAsmParser {
506
506
507
507
bool isMnemonicVPTPredicable (StringRef Mnemonic, StringRef ExtraToken);
508
508
StringRef splitMnemonic (StringRef Mnemonic, StringRef ExtraToken,
509
- unsigned &PredicationCode,
510
- unsigned &VPTPredicationCode, bool &CarrySetting,
511
- unsigned &ProcessorIMod, StringRef &ITMask);
509
+ ARMCC::CondCodes &PredicationCode,
510
+ ARMVCC::VPTCodes &VPTPredicationCode,
511
+ bool &CarrySetting, unsigned &ProcessorIMod,
512
+ StringRef &ITMask);
512
513
void getMnemonicAcceptInfo (StringRef Mnemonic, StringRef ExtraToken,
513
514
StringRef FullInst, bool &CanAcceptCarrySet,
514
515
bool &CanAcceptPredicationCode,
@@ -6283,10 +6284,9 @@ bool ARMAsmParser::parsePrefix(ARMMCExpr::VariantKind &RefKind) {
6283
6284
//
6284
6285
// FIXME: Would be nice to autogen this.
6285
6286
// FIXME: This is a bit of a maze of special cases.
6286
- StringRef ARMAsmParser::splitMnemonic (StringRef Mnemonic,
6287
- StringRef ExtraToken,
6288
- unsigned &PredicationCode,
6289
- unsigned &VPTPredicationCode,
6287
+ StringRef ARMAsmParser::splitMnemonic (StringRef Mnemonic, StringRef ExtraToken,
6288
+ ARMCC::CondCodes &PredicationCode,
6289
+ ARMVCC::VPTCodes &VPTPredicationCode,
6290
6290
bool &CarrySetting,
6291
6291
unsigned &ProcessorIMod,
6292
6292
StringRef &ITMask) {
@@ -6340,7 +6340,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
6340
6340
unsigned CC = ARMCondCodeFromString (Mnemonic.substr (Mnemonic.size ()-2 ));
6341
6341
if (CC != ~0U ) {
6342
6342
Mnemonic = Mnemonic.slice (0 , Mnemonic.size () - 2 );
6343
- PredicationCode = CC;
6343
+ PredicationCode = (ARMCC::CondCodes) CC;
6344
6344
}
6345
6345
}
6346
6346
@@ -6387,7 +6387,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
6387
6387
unsigned CC = ARMVectorCondCodeFromString (Mnemonic.substr (Mnemonic.size ()-1 ));
6388
6388
if (CC != ~0U ) {
6389
6389
Mnemonic = Mnemonic.slice (0 , Mnemonic.size ()-1 );
6390
- VPTPredicationCode = CC;
6390
+ VPTPredicationCode = (ARMVCC::VPTCodes) CC;
6391
6391
}
6392
6392
return Mnemonic;
6393
6393
}
0 commit comments