[llvm-commits] CVS: llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp SparcV8InstrInfo.td

Chris Lattner lattner at cs.uiuc.edu
Sun Jan 29 23:43:16 PST 2006



Changes in directory llvm/lib/Target/SparcV8:

SparcV8ISelDAGToDAG.cpp updated: 1.67 -> 1.68
SparcV8InstrInfo.td updated: 1.108 -> 1.109
---
Log message:

Revamp the ICC/FCC reading instructions to be parameterized in terms of the
SPARC condition codes, not in terms of the DAG condcodes.  This allows us to
write nice clean patterns for cmovs/branches.


---
Diffs of the changes:  (+212 -71)

 SparcV8ISelDAGToDAG.cpp |  172 ++++++++++++++++++++++++++++++++++++------------
 SparcV8InstrInfo.td     |  111 ++++++++++++++++++++++--------
 2 files changed, 212 insertions(+), 71 deletions(-)


Index: llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp
diff -u llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp:1.67 llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp:1.68
--- llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp:1.67	Mon Jan 30 00:14:02 2006
+++ llvm/lib/Target/SparcV8/SparcV8ISelDAGToDAG.cpp	Mon Jan 30 01:43:04 2006
@@ -50,6 +50,123 @@
   };
 }
 
+// Enums corresponding to SparcV8 condition codes, both icc's and fcc's.  These
+// values must be kept in sync with the ones in the .td file.
+namespace V8CC {
+  enum CondCodes {
+  //ICC_A   =  8   ,  // Always
+  //ICC_N   =  0   ,  // Never
+    ICC_NE  =  9   ,  // Not Equal
+    ICC_E   =  1   ,  // Equal
+    ICC_G   = 10   ,  // Greater
+    ICC_LE  =  2   ,  // Less or Equal
+    ICC_GE  = 11   ,  // Greater or Equal
+    ICC_L   =  3   ,  // Less
+    ICC_GU  = 12   ,  // Greater Unsigned
+    ICC_LEU =  4   ,  // Less or Equal Unsigned
+    ICC_CC  = 13   ,  // Carry Clear/Great or Equal Unsigned
+    ICC_CS  =  5   ,  // Carry Set/Less Unsigned
+    ICC_POS = 14   ,  // Positive
+    ICC_NEG =  6   ,  // Negative
+    ICC_VC  = 15   ,  // Overflow Clear
+    ICC_VS  =  7   ,  // Overflow Set
+    
+  //FCC_A   =  8+16,  // Always
+  //FCC_N   =  0+16,  // Never
+    FCC_U   =  7+16,  // Unordered
+    FCC_G   =  6+16,  // Greater
+    FCC_UG  =  5+16,  // Unordered or Greater
+    FCC_L   =  4+16,  // Less
+    FCC_UL  =  3+16,  // Unordered or Less
+    FCC_LG  =  2+16,  // Less or Greater
+    FCC_NE  =  1+16,  // Not Equal
+    FCC_E   =  9+16,  // Equal
+    FCC_UE  = 10+16,  // Unordered or Equal
+    FCC_GE  = 11+16,  // Greater or Equal
+    FCC_UGE = 12+16,  // Unordered or Greater or Equal
+    FCC_LE  = 13+16,  // Less or Equal
+    FCC_ULE = 14+16,  // Unordered or Less or Equal
+    FCC_O   = 15+16,  // Ordered
+  };
+}
+
+
+/// IntCondCCodeToICC - Convert a DAG integer condition code to a SPARC ICC
+/// condition.
+static V8CC::CondCodes IntCondCCodeToICC(ISD::CondCode CC) {
+  switch (CC) {
+  default: assert(0 && "Unknown integer condition code!");
+  case ISD::SETEQ:  return V8CC::ICC_E;
+  case ISD::SETNE:  return V8CC::ICC_NE;
+  case ISD::SETLT:  return V8CC::ICC_L;
+  case ISD::SETGT:  return V8CC::ICC_G;
+  case ISD::SETLE:  return V8CC::ICC_LE;
+  case ISD::SETGE:  return V8CC::ICC_GE;
+  case ISD::SETULT: return V8CC::ICC_CS;
+  case ISD::SETULE: return V8CC::ICC_LEU;
+  case ISD::SETUGT: return V8CC::ICC_GU;
+  case ISD::SETUGE: return V8CC::ICC_CC;
+  }
+}
+
+/// FPCondCCodeToFCC - Convert a DAG floatingp oint condition code to a SPARC
+/// FCC condition.
+static V8CC::CondCodes FPCondCCodeToFCC(ISD::CondCode CC) {
+  switch (CC) {
+  default: assert(0 && "Unknown fp condition code!");
+  case ISD::SETEQ:  return V8CC::FCC_E;
+  case ISD::SETNE:  return V8CC::FCC_NE;
+  case ISD::SETLT:  return V8CC::FCC_L;
+  case ISD::SETGT:  return V8CC::FCC_G;
+  case ISD::SETLE:  return V8CC::FCC_LE;
+  case ISD::SETGE:  return V8CC::FCC_GE;
+  case ISD::SETULT: return V8CC::FCC_UL;
+  case ISD::SETULE: return V8CC::FCC_ULE;
+  case ISD::SETUGT: return V8CC::FCC_UG;
+  case ISD::SETUGE: return V8CC::FCC_UGE;
+  case ISD::SETUO:  return V8CC::FCC_U;
+  case ISD::SETO:   return V8CC::FCC_O;
+  case ISD::SETONE: return V8CC::FCC_LG;
+  case ISD::SETUEQ: return V8CC::FCC_UE;
+  }
+}
+  
+
+static unsigned SPARCCondCodeToBranchInstr(V8CC::CondCodes CC) {
+  switch (CC) {
+  default: assert(0 && "Unknown condition code");
+  case V8CC::ICC_NE:  return V8::BNE;
+  case V8CC::ICC_E:   return V8::BE;
+  case V8CC::ICC_G:   return V8::BG;
+  case V8CC::ICC_LE:  return V8::BLE;
+  case V8CC::ICC_GE:  return V8::BGE;
+  case V8CC::ICC_L:   return V8::BL;
+  case V8CC::ICC_GU:  return V8::BGU;
+  case V8CC::ICC_LEU: return V8::BLEU;
+  case V8CC::ICC_CC:  return V8::BCC;
+  case V8CC::ICC_CS:  return V8::BCS;
+  case V8CC::ICC_POS: return V8::BPOS;
+  case V8CC::ICC_NEG: return V8::BNEG;
+  case V8CC::ICC_VC:  return V8::BVC;
+  case V8CC::ICC_VS:  return V8::BVS;
+  case V8CC::FCC_U:   return V8::FBU;
+  case V8CC::FCC_G:   return V8::FBG;
+  case V8CC::FCC_UG:  return V8::FBUG;
+  case V8CC::FCC_L:   return V8::FBL;
+  case V8CC::FCC_UL:  return V8::FBUL;
+  case V8CC::FCC_LG:  return V8::FBLG;
+  case V8CC::FCC_NE:  return V8::FBNE;
+  case V8CC::FCC_E:   return V8::FBE;
+  case V8CC::FCC_UE:  return V8::FBUE;
+  case V8CC::FCC_GE:  return V8::FBGE;
+  case V8CC::FCC_UGE: return V8::FBUGE;
+  case V8CC::FCC_LE:  return V8::FBLE;
+  case V8CC::FCC_ULE: return V8::FBULE;
+  case V8CC::FCC_O:   return V8::FBO;
+  }       
+}
+
+
 namespace {
   class SparcV8TargetLowering : public TargetLowering {
     int VarArgsFrameOffset;   // Frame offset to start of varargs area.
@@ -645,7 +762,7 @@
   }
   case ISD::BR_CC: {
     SDOperand Chain = Op.getOperand(0);
-    SDOperand CC = Op.getOperand(1);
+    ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(1))->get();
     SDOperand LHS = Op.getOperand(2);
     SDOperand RHS = Op.getOperand(3);
     SDOperand Dest = Op.getOperand(4);
@@ -659,19 +776,22 @@
       Ops.push_back(LHS);
       Ops.push_back(RHS);
       SDOperand Cond = DAG.getNode(V8ISD::CMPICC, VTs, Ops).getValue(1);
-      return DAG.getNode(V8ISD::BRICC, MVT::Other, Chain, Dest, CC, Cond);
+      SDOperand CCN = DAG.getConstant(IntCondCCodeToICC(CC), MVT::i32);
+      return DAG.getNode(V8ISD::BRICC, MVT::Other, Chain, Dest, CCN, Cond);
     } else {
       SDOperand Cond = DAG.getNode(V8ISD::CMPFCC, MVT::Flag, LHS, RHS);
-      return DAG.getNode(V8ISD::BRFCC, MVT::Other, Chain, Dest, CC, Cond);
+      SDOperand CCN = DAG.getConstant(FPCondCCodeToFCC(CC), MVT::i32);
+      return DAG.getNode(V8ISD::BRFCC, MVT::Other, Chain, Dest, CCN, Cond);
     }
   }
   case ISD::SELECT_CC: {
     SDOperand LHS = Op.getOperand(0);
     SDOperand RHS = Op.getOperand(1);
-    unsigned CC = cast<CondCodeSDNode>(Op.getOperand(4))->get();
+    ISD::CondCode CC = cast<CondCodeSDNode>(Op.getOperand(4))->get();
     SDOperand TrueVal = Op.getOperand(2);
     SDOperand FalseVal = Op.getOperand(3);
-    
+    unsigned Opc, V8CC = ~0U;
+
     // If this is a select_cc of a "setcc", and if the setcc got lowered into
     // an CMP[IF]CC/SELECT_[IF]CC pair, find the original compared values.
     if (isa<ConstantSDNode>(RHS) && cast<ConstantSDNode>(RHS)->getValue() == 0&&
@@ -685,13 +805,12 @@
         cast<ConstantSDNode>(LHS.getOperand(0))->getValue() == 1 &&
         cast<ConstantSDNode>(LHS.getOperand(1))->getValue() == 0) {
       SDOperand CMPCC = LHS.getOperand(3);
-      CC = cast<ConstantSDNode>(LHS.getOperand(2))->getValue();
+      V8CC = cast<ConstantSDNode>(LHS.getOperand(2))->getValue();
       LHS = CMPCC.getOperand(0);
       RHS = CMPCC.getOperand(1);
     }
     
     SDOperand CompareFlag;
-    unsigned Opc;
     if (LHS.getValueType() == MVT::i32) {
       std::vector<MVT::ValueType> VTs;
       VTs.push_back(LHS.getValueType());   // subcc returns a value
@@ -701,12 +820,14 @@
       Ops.push_back(RHS);
       CompareFlag = DAG.getNode(V8ISD::CMPICC, VTs, Ops).getValue(1);
       Opc = V8ISD::SELECT_ICC;
+      if (V8CC == ~0U) V8CC = IntCondCCodeToICC(CC);
     } else {
       CompareFlag = DAG.getNode(V8ISD::CMPFCC, MVT::Flag, LHS, RHS);
       Opc = V8ISD::SELECT_FCC;
+      if (V8CC == ~0U) V8CC = FPCondCCodeToFCC(CC);
     }
     return DAG.getNode(Opc, TrueVal.getValueType(), TrueVal, FalseVal, 
-                       DAG.getConstant(CC, MVT::i32), CompareFlag);
+                       DAG.getConstant(V8CC, MVT::i32), CompareFlag);
   }
   case ISD::VASTART: {
     // vastart just stores the address of the VarArgsFrameIndex slot into the
@@ -759,42 +880,11 @@
   case V8::SELECT_CC_Int_ICC:
   case V8::SELECT_CC_FP_ICC:
   case V8::SELECT_CC_DFP_ICC:
-    // Integer compare.
-    switch ((ISD::CondCode)MI->getOperand(3).getImmedValue()) {
-    default: assert(0 && "Unknown integer condition code!");
-    case ISD::SETEQ:  BROpcode = V8::BE; break;
-    case ISD::SETNE:  BROpcode = V8::BNE; break;
-    case ISD::SETLT:  BROpcode = V8::BL; break;
-    case ISD::SETGT:  BROpcode = V8::BG; break;
-    case ISD::SETLE:  BROpcode = V8::BLE; break;
-    case ISD::SETGE:  BROpcode = V8::BGE; break;
-    case ISD::SETULT: BROpcode = V8::BCS; break;
-    case ISD::SETULE: BROpcode = V8::BLEU; break;
-    case ISD::SETUGT: BROpcode = V8::BGU; break;
-    case ISD::SETUGE: BROpcode = V8::BCC; break;
-    }
-    break;
   case V8::SELECT_CC_Int_FCC:
   case V8::SELECT_CC_FP_FCC:
   case V8::SELECT_CC_DFP_FCC:
-    // FP compare.
-    switch ((ISD::CondCode)MI->getOperand(3).getImmedValue()) {
-    default: assert(0 && "Unknown fp condition code!");
-    case ISD::SETEQ:  BROpcode = V8::FBE; break;
-    case ISD::SETNE:  BROpcode = V8::FBNE; break;
-    case ISD::SETLT:  BROpcode = V8::FBL; break;
-    case ISD::SETGT:  BROpcode = V8::FBG; break;
-    case ISD::SETLE:  BROpcode = V8::FBLE; break;
-    case ISD::SETGE:  BROpcode = V8::FBGE; break;
-    case ISD::SETULT: BROpcode = V8::FBUL; break;
-    case ISD::SETULE: BROpcode = V8::FBULE; break;
-    case ISD::SETUGT: BROpcode = V8::FBUG; break;
-    case ISD::SETUGE: BROpcode = V8::FBUGE; break;
-    case ISD::SETUO:  BROpcode = V8::FBU; break;
-    case ISD::SETO:   BROpcode = V8::FBO; break;
-    case ISD::SETONE: BROpcode = V8::FBLG; break;
-    case ISD::SETUEQ: BROpcode = V8::FBUE; break;
-    }
+    V8CC::CondCodes CC = (V8CC::CondCodes)MI->getOperand(3).getImmedValue();
+    BROpcode = SPARCCondCodeToBranchInstr(CC);
     break;
   }
   


Index: llvm/lib/Target/SparcV8/SparcV8InstrInfo.td
diff -u llvm/lib/Target/SparcV8/SparcV8InstrInfo.td:1.108 llvm/lib/Target/SparcV8/SparcV8InstrInfo.td:1.109
--- llvm/lib/Target/SparcV8/SparcV8InstrInfo.td:1.108	Mon Jan 30 00:14:02 2006
+++ llvm/lib/Target/SparcV8/SparcV8InstrInfo.td	Mon Jan 30 01:43:04 2006
@@ -84,7 +84,7 @@
 def SDTV8cmpfcc : 
 SDTypeProfile<1, 2, [SDTCisVT<0, FlagVT>, SDTCisFP<1>, SDTCisSameAs<1, 2>]>;
 def SDTV8brcc : 
-SDTypeProfile<0, 3, [SDTCisVT<0, OtherVT>, SDTCisVT<1, OtherVT>,
+SDTypeProfile<0, 3, [SDTCisVT<0, OtherVT>, SDTCisVT<1, i32>,
                      SDTCisVT<2, FlagVT>]>;
 def SDTV8selectcc :
 SDTypeProfile<1, 4, [SDTCisSameAs<0, 1>, SDTCisSameAs<1, 2>, 
@@ -122,6 +122,43 @@
 	                   [SDNPHasChain, SDNPOptInFlag]>;
 
 //===----------------------------------------------------------------------===//
+// SPARC Flag Conditions
+//===----------------------------------------------------------------------===//
+
+// Note that these values must be kept in sync with the V8CC::CondCode enum
+// values.
+def ICC_NE  : PatLeaf<(i32  9)>;  // Not Equal
+def ICC_E   : PatLeaf<(i32  1)>;  // Equal
+def ICC_G   : PatLeaf<(i32 10)>;  // Greater
+def ICC_LE  : PatLeaf<(i32  2)>;  // Less or Equal
+def ICC_GE  : PatLeaf<(i32 11)>;  // Greater or Equal
+def ICC_L   : PatLeaf<(i32  3)>;  // Less
+def ICC_GU  : PatLeaf<(i32 12)>;  // Greater Unsigned
+def ICC_LEU : PatLeaf<(i32  4)>;  // Less or Equal Unsigned
+def ICC_CC  : PatLeaf<(i32 13)>;  // Carry Clear/Great or Equal Unsigned
+def ICC_CS  : PatLeaf<(i32  5)>;  // Carry Set/Less Unsigned
+def ICC_POS : PatLeaf<(i32 14)>;  // Positive
+def ICC_NEG : PatLeaf<(i32  6)>;  // Negative
+def ICC_VC  : PatLeaf<(i32 15)>;  // Overflow Clear
+def ICC_VS  : PatLeaf<(i32  7)>;  // Overflow Set
+
+def FCC_U   : PatLeaf<(i32 23)>;  // Unordered
+def FCC_G   : PatLeaf<(i32 22)>;  // Greater
+def FCC_UG  : PatLeaf<(i32 21)>;  // Unordered or Greater
+def FCC_L   : PatLeaf<(i32 20)>;  // Less
+def FCC_UL  : PatLeaf<(i32 19)>;  // Unordered or Less
+def FCC_LG  : PatLeaf<(i32 18)>;  // Less or Greater
+def FCC_NE  : PatLeaf<(i32 17)>;  // Not Equal
+def FCC_E   : PatLeaf<(i32 25)>;  // Equal
+def FCC_UE  : PatLeaf<(i32 24)>;  // Unordered or Equal
+def FCC_GE  : PatLeaf<(i32 25)>;  // Greater or Equal
+def FCC_UGE : PatLeaf<(i32 26)>;  // Unordered or Greater or Equal
+def FCC_LE  : PatLeaf<(i32 27)>;  // Less or Equal
+def FCC_ULE : PatLeaf<(i32 28)>;  // Unordered or Less or Equal
+def FCC_O   : PatLeaf<(i32 29)>;  // Ordered
+
+
+//===----------------------------------------------------------------------===//
 // Instructions
 //===----------------------------------------------------------------------===//
 
@@ -498,34 +535,48 @@
                       [(br bb:$dst)]>;
 def BNE  : BranchV8<0b1001, (ops brtarget:$dst),
                     "bne $dst",
-                    [(V8bricc bb:$dst, SETNE, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_NE, ICC)]>;
 def BE   : BranchV8<0b0001, (ops brtarget:$dst),
                     "be $dst",
-                    [(V8bricc bb:$dst, SETEQ, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_E, ICC)]>;
 def BG   : BranchV8<0b1010, (ops brtarget:$dst),
                     "bg $dst",
-                    [(V8bricc bb:$dst, SETGT, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_G, ICC)]>;
 def BLE  : BranchV8<0b0010, (ops brtarget:$dst),
                     "ble $dst",
-                    [(V8bricc bb:$dst, SETLE, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_LE, ICC)]>;
 def BGE  : BranchV8<0b1011, (ops brtarget:$dst),
                     "bge $dst",
-                    [(V8bricc bb:$dst, SETGE, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_GE, ICC)]>;
 def BL   : BranchV8<0b0011, (ops brtarget:$dst),
                     "bl $dst",
-                    [(V8bricc bb:$dst, SETLT, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_L, ICC)]>;
 def BGU  : BranchV8<0b1100, (ops brtarget:$dst),
                     "bgu $dst",
-                    [(V8bricc bb:$dst, SETUGT, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_GU, ICC)]>;
 def BLEU : BranchV8<0b0100, (ops brtarget:$dst),
                     "bleu $dst",
-                    [(V8bricc bb:$dst, SETULE, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_LEU, ICC)]>;
 def BCC  : BranchV8<0b1101, (ops brtarget:$dst),
                     "bcc $dst",
-                    [(V8bricc bb:$dst, SETUGE, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_CC, ICC)]>;
 def BCS  : BranchV8<0b0101, (ops brtarget:$dst),
                     "bcs $dst",
-                    [(V8bricc bb:$dst, SETULT, ICC)]>;
+                    [(V8bricc bb:$dst, ICC_CS, ICC)]>;
+def BPOS : BranchV8<0b1110, (ops brtarget:$dst),
+                    "bpos $dst",
+                    [(V8bricc bb:$dst, ICC_POS, ICC)]>;
+def BNEG : BranchV8<0b0110, (ops brtarget:$dst),
+                    "bneg $dst",
+                    [(V8bricc bb:$dst, ICC_NEG, ICC)]>;
+def BVC  : BranchV8<0b1111, (ops brtarget:$dst),
+                    "bvc $dst",
+                    [(V8bricc bb:$dst, ICC_VC, ICC)]>;
+def BVS  : BranchV8<0b0111, (ops brtarget:$dst),
+                    "bvs $dst",
+                    [(V8bricc bb:$dst, ICC_VS, ICC)]>;
+
+
 
 // Section B.22 - Branch on Floating-point Condition Codes Instructions, p. 121
 
@@ -540,46 +591,46 @@
 
 def FBU  : FPBranchV8<0b0111, (ops brtarget:$dst),
                       "fbu $dst",
-                      [(V8brfcc bb:$dst, SETUO, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_U, FCC)]>;
 def FBG  : FPBranchV8<0b0110, (ops brtarget:$dst),
                       "fbg $dst",
-                      [(V8brfcc bb:$dst, SETGT, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_G, FCC)]>;
 def FBUG : FPBranchV8<0b0101, (ops brtarget:$dst),
                       "fbug $dst",
-                      [(V8brfcc bb:$dst, SETUGT, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_UG, FCC)]>;
 def FBL  : FPBranchV8<0b0100, (ops brtarget:$dst),
                       "fbl $dst",
-                      [(V8brfcc bb:$dst, SETLT, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_L, FCC)]>;
 def FBUL : FPBranchV8<0b0011, (ops brtarget:$dst),
                       "fbul $dst",
-                      [(V8brfcc bb:$dst, SETULT, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_UL, FCC)]>;
 def FBLG : FPBranchV8<0b0010, (ops brtarget:$dst),
                       "fblg $dst",
-                      [(V8brfcc bb:$dst, SETONE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_LG, FCC)]>;
 def FBNE : FPBranchV8<0b0001, (ops brtarget:$dst),
                       "fbne $dst",
-                      [(V8brfcc bb:$dst, SETNE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_NE, FCC)]>;
 def FBE  : FPBranchV8<0b1001, (ops brtarget:$dst),
                       "fbe $dst",
-                      [(V8brfcc bb:$dst, SETEQ, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_E, FCC)]>;
 def FBUE : FPBranchV8<0b1010, (ops brtarget:$dst),
                       "fbue $dst",
-                      [(V8brfcc bb:$dst, SETUEQ, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_UE, FCC)]>;
 def FBGE : FPBranchV8<0b1011, (ops brtarget:$dst),
                       "fbge $dst",
-                      [(V8brfcc bb:$dst, SETGE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_GE, FCC)]>;
 def FBUGE: FPBranchV8<0b1100, (ops brtarget:$dst),
                       "fbuge $dst",
-                      [(V8brfcc bb:$dst, SETUGE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_UGE, FCC)]>;
 def FBLE : FPBranchV8<0b1101, (ops brtarget:$dst),
                       "fble $dst",
-                      [(V8brfcc bb:$dst, SETLE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_LE, FCC)]>;
 def FBULE: FPBranchV8<0b1110, (ops brtarget:$dst),
                       "fbule $dst",
-                      [(V8brfcc bb:$dst, SETULE, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_ULE, FCC)]>;
 def FBO  : FPBranchV8<0b1111, (ops brtarget:$dst),
                       "fbo $dst",
-                      [(V8brfcc bb:$dst, SETO, FCC)]>;
+                      [(V8brfcc bb:$dst, FCC_O, FCC)]>;
 
 
 
@@ -742,11 +793,11 @@
   def MOVNE : Pseudo<(ops IntRegs:$dst, IntRegs:$T, IntRegs:$F),
                      "movne %icc, $F, $dst",
                      [(set IntRegs:$dst,
-                           (V8selecticc IntRegs:$F, IntRegs:$T, 22, ICC))]>;
-  def MOVEQ : Pseudo<(ops IntRegs:$dst, IntRegs:$T, IntRegs:$F),
-                     "move %icc, $F, $dst",
-                     [(set IntRegs:$dst,
-                           (V8selecticc IntRegs:$F, IntRegs:$T, 17, ICC))]>;
+                           (V8selecticc IntRegs:$F, IntRegs:$T, ICC_NE, ICC))]>;
+  def MOVE : Pseudo<(ops IntRegs:$dst, IntRegs:$T, IntRegs:$F),
+                    "move %icc, $F, $dst",
+                    [(set IntRegs:$dst,
+                          (V8selecticc IntRegs:$F, IntRegs:$T, ICC_E, ICC))]>;
 }
 
 // Floating-Point Move Instructions, p. 164 of the V9 manual.






More information about the llvm-commits mailing list