Rewrite isS34Imm() to a template function and rename function to reflect actual checks.

Author: lei137

llvm/lib/Target/PowerPC/AsmParser/PPCAsmParser.cpp

@@ -365,14 +365,12 @@ struct PPCOperand : public MCParsedAsmOperand {
   bool isS16ImmX4() const { return isExtImm<16>(/*Signed*/ true, 4); }
   bool isS16ImmX16() const { return isExtImm<16>(/*Signed*/ true, 16); }
   bool isS17Imm() const { return isExtImm<17>(/*Signed*/ true, 1); }
-  bool isS32Imm() const {
-    // TODO: Is ContextImmediate needed?
-    return Kind == Expression || isSImm<32>();
-  }
-  bool isS34Imm() const {
+
+  template <uint64_t N>
+  bool isSImmExpr() const {
     // Once the PC-Rel ABI is finalized, evaluate whether a 34-bit
     // ContextImmediate is needed.
-    return Kind == Expression || isSImm<34>();
+    return Kind == Expression || isSImm<N>();
   }
   bool isS34ImmX16() const {
     return Kind == Expression || (isSImm<34>() && (getImm() & 15) == 0);

llvm/lib/Target/PowerPC/PPCRegisterInfo.td

@@ -810,7 +810,7 @@ def s17imm64 : Operand<i64> {
 }
 def PPCS32ImmAsmOperand : AsmOperandClass {
   let Name = "S32Imm";
-  let PredicateMethod = "isS32Imm";
+  let PredicateMethod = "isSImmExpr<32>";
   let RenderMethod = "addImmOperands";
 }
 def s32imm : Operand<i64> {
@@ -829,7 +829,7 @@ def s32imm_pcrel : Operand<i64> {
 }
 def PPCS34ImmAsmOperand : AsmOperandClass {
   let Name = "S34Imm";
-  let PredicateMethod = "isS34Imm";
+  let PredicateMethod = "isSImmExpr<34>";
   let RenderMethod = "addImmOperands";
 }
 def s34imm : Operand<i64> {
@@ -933,7 +933,7 @@ def ptr_rc_nor0 : RegisterOperand<ptr_rc_nor0_by_hwmode> {
 
 // New addressing modes with 34 bit immediates.
 def PPCDispRI34Operand : AsmOperandClass {
-  let Name = "DispRI34"; let PredicateMethod = "isS34Imm";
+  let Name = "DispRI34"; let PredicateMethod = "isSImmExpr<34>";
   let RenderMethod = "addImmOperands";
 }
 def dispRI34 : Operand<iPTR> {