[ARM] Change the type of CC and VCC code in splitMnemonic.

[AlfieRichardsArm]

This changes the type of PredicationCode and VPTPredicationCode from unsigned to ARMCC::CondCodes and ARMVCC::VPTCodes resp' for clarity and correctness.

[llvmbot]

@llvm/pr-subscribers-mc

@llvm/pr-subscribers-backend-arm

Author: Alfie Richards (AlfieRichardsArm)

Changes

This changes the type of PredicationCode and VPTPredicationCode from unsigned to ARMCC::CondCodes and ARMVCC::VPTCodes resp' for clarity and correctness.

---

Full diff: https://github.com/llvm/llvm-project/pull/83413.diff

1 Files Affected:

• (modified) llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp (+9-9)

diff --git a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
index 37bfb76a494dee..dd6c637a6fa2a0 100644
--- a/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
+++ b/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
@@ -506,9 +506,10 @@ class ARMAsmParser : public MCTargetAsmParser {
 
   bool isMnemonicVPTPredicable(StringRef Mnemonic, StringRef ExtraToken);
   StringRef splitMnemonic(StringRef Mnemonic, StringRef ExtraToken,
-                          unsigned &PredicationCode,
-                          unsigned &VPTPredicationCode, bool &CarrySetting,
-                          unsigned &ProcessorIMod, StringRef &ITMask);
+                          ARMCC::CondCodes &PredicationCode,
+                          ARMVCC::VPTCodes &VPTPredicationCode,
+                          bool &CarrySetting, unsigned &ProcessorIMod,
+                          StringRef &ITMask);
   void getMnemonicAcceptInfo(StringRef Mnemonic, StringRef ExtraToken,
                              StringRef FullInst, bool &CanAcceptCarrySet,
                              bool &CanAcceptPredicationCode,
@@ -6283,10 +6284,9 @@ bool ARMAsmParser::parsePrefix(ARMMCExpr::VariantKind &RefKind) {
 //
 // FIXME: Would be nice to autogen this.
 // FIXME: This is a bit of a maze of special cases.
-StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
-                                      StringRef ExtraToken,
-                                      unsigned &PredicationCode,
-                                      unsigned &VPTPredicationCode,
+StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic, StringRef ExtraToken,
+                                      ARMCC::CondCodes &PredicationCode,
+                                      ARMVCC::VPTCodes &VPTPredicationCode,
                                       bool &CarrySetting,
                                       unsigned &ProcessorIMod,
                                       StringRef &ITMask) {
@@ -6340,7 +6340,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
     unsigned CC = ARMCondCodeFromString(Mnemonic.substr(Mnemonic.size()-2));
     if (CC != ~0U) {
       Mnemonic = Mnemonic.slice(0, Mnemonic.size() - 2);
-      PredicationCode = CC;
+      PredicationCode = (ARMCC::CondCodes)CC;
     }
   }
 
@@ -6387,7 +6387,7 @@ StringRef ARMAsmParser::splitMnemonic(StringRef Mnemonic,
     unsigned CC = ARMVectorCondCodeFromString(Mnemonic.substr(Mnemonic.size()-1));
     if (CC != ~0U) {
       Mnemonic = Mnemonic.slice(0, Mnemonic.size()-1);
-      VPTPredicationCode = CC;
+      VPTPredicationCode = (ARMVCC::VPTCodes)CC;
     }
     return Mnemonic;
   }

[AlfieRichardsArm]

Note the failing test is not relevant, seems to be a timeout or similar

[AlfieRichardsArm]

I will wait a couple days for external code review

[AlfieRichardsArm]

@s-barannikov I've added you as a reviewer as this commit is a prerequisite for some optional operands work that I will submit in coming days and I see you have worked on the same area.

[s-barannikov]

Straightforward change, LGTM modulo style nit

[s-barannikov]

https://llvm.org/docs/CodingStandards.html#prefer-c-style-casts

[AlfieRichardsArm]

The anchor link really changes the meaning of that link (:
I'll get a quick fix in

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[AlfieRichardsArm]

Failing test continues to be a seemingly unrelated failure regarding MLIR

[AlfieRichardsArm]

After a fixing me pushing to the wrong branch this is back to what it should be.

[AlfieRichardsArm]

Test failure is unrelated MLIR test. Merging this now.