commit ee776452f9c920b9d93a021ff7ef65b696a8099f
author Colin LeMahieu <colinl@codeaurora.org> Tue Mar 10 19:29:53 2015 +0000
committer Colin LeMahieu <colinl@codeaurora.org> Tue Mar 10 19:29:53 2015 +0000
tree 348dc7bc98c5c358a0c94b3921be757b9beaf12d
parent 51233680ae3c02dba263e014d83fa14740042187

[Hexagon] Renaming HexagonJT to JT and adding CP for constantpool.

llvm-svn: 231824

llvm/lib/Target/Hexagon/HexagonISelLowering.cpp

diff --git a/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp b/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp
index 0072994..8d0aef0 100644
--- a/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp
+++ b/llvm/lib/Target/Hexagon/HexagonISelLowering.cpp
@@ -764,7 +764,7 @@
     BlockAddress::get(const_cast<BasicBlock *>(MBB->getBasicBlock()));
   }
 
-  SDValue JumpTableBase = DAG.getNode(HexagonISD::WrapperJT, dl,
+  SDValue JumpTableBase = DAG.getNode(HexagonISD::JT, dl,
                                       getPointerTy(), TargetJT);
   SDValue ShiftIndex = DAG.getNode(ISD::SHL, dl, MVT::i32, Index,
                                    DAG.getConstant(2, MVT::i32));

llvm/lib/Target/Hexagon/HexagonISelLowering.h

diff --git a/llvm/lib/Target/Hexagon/HexagonISelLowering.h b/llvm/lib/Target/Hexagon/HexagonISelLowering.h
index 514689c..bd47d8a 100644
--- a/llvm/lib/Target/Hexagon/HexagonISelLowering.h
+++ b/llvm/lib/Target/Hexagon/HexagonISelLowering.h
@@ -59,8 +59,8 @@
       POPCOUNT,
       COMBINE,
       PACKHL,
-      WrapperJT,
-      WrapperCP,
+      JT,
+      CP,
       WrapperCombineII,
       WrapperCombineRR,
       WrapperCombineRI_V4,

llvm/lib/Target/Hexagon/HexagonInstrInfo.td

diff --git a/llvm/lib/Target/Hexagon/HexagonInstrInfo.td b/llvm/lib/Target/Hexagon/HexagonInstrInfo.td
index 8950f34..361a27a 100644
--- a/llvm/lib/Target/Hexagon/HexagonInstrInfo.td
+++ b/llvm/lib/Target/Hexagon/HexagonInstrInfo.td
@@ -5129,10 +5129,13 @@
 def: Pat<(i32 (sext_inreg (Hexagon_ARGEXTEND (i32 IntRegs:$src1)), i16)),
          (i32 IntRegs:$src1)>;
 
-def HexagonWrapperJT: SDNode<"HexagonISD::WrapperJT", SDTIntUnaryOp>;
+def HexagonJT:     SDNode<"HexagonISD::JT", SDTIntUnaryOp>;
+def HexagonCP:     SDNode<"HexagonISD::CP", SDTIntUnaryOp>;
 
-def : Pat<(HexagonWrapperJT tjumptable:$dst),
-          (i32 (CONST32_set_jt tjumptable:$dst))>;
+def: Pat<(HexagonJT tjumptable:$dst),
+         (CONST32_set_jt tjumptable:$dst)>;
+def: Pat<(HexagonCP tconstpool :$dst),
+         (CONST32_set_jt tconstpool:$dst)>;
 
 // XTYPE/SHIFT
 //