diff options
| author | Rafael Espindola <rafael.espindola@gmail.com> | 2009-03-27 15:45:05 +0000 |
|---|---|---|
| committer | Rafael Espindola <rafael.espindola@gmail.com> | 2009-03-27 15:45:05 +0000 |
| commit | 227815437a1b612aa33ddef1e78493e1d34e0181 (patch) | |
| tree | b42b695573de8f78b67384dd588ba938056f3d80 | |
| parent | 073da05fa4cf40e2dc776155a2683af6b49d63d4 (diff) | |
| download | bcm5719-llvm-227815437a1b612aa33ddef1e78493e1d34e0181.tar.gz bcm5719-llvm-227815437a1b612aa33ddef1e78493e1d34e0181.zip | |
Use less hard coded constants to make the code less brittle.
llvm-svn: 67846
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelDAGToDAG.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp index 1317b53a78e..f3b81ba40fd 100644 --- a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp +++ b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp @@ -1212,8 +1212,9 @@ SDNode *X86DAGToDAGISel::SelectAtomic64(SDNode *Node, unsigned Opc) { return NULL; SDValue LSI = Node->getOperand(4); // MemOperand const SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, In2L, In2H, LSI, Chain }; - return CurDAG->getTargetNode(Opc, Node->getDebugLoc(), - MVT::i32, MVT::i32, MVT::Other, Ops, 8); + return CurDAG->getTargetNode(Opc, Node->getDebugLoc(), + MVT::i32, MVT::i32, MVT::Other, Ops, + sizeof(Ops)/sizeof(SDValue)); } SDNode *X86DAGToDAGISel::Select(SDValue N) { @@ -1307,7 +1308,8 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) { if (foldedLoad) { SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, N1.getOperand(0), InFlag }; SDNode *CNode = - CurDAG->getTargetNode(MOpc, dl, MVT::Other, MVT::Flag, Ops, 6); + CurDAG->getTargetNode(MOpc, dl, MVT::Other, MVT::Flag, Ops, + sizeof(Ops)/sizeof(SDValue)); InFlag = SDValue(CNode, 1); // Update the chain. ReplaceUses(N1.getValue(1), SDValue(CNode, 0)); @@ -1426,7 +1428,8 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) { SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, N0.getOperand(0) }; Move = SDValue(CurDAG->getTargetNode(X86::MOVZX16rm8, dl, MVT::i16, - MVT::Other, Ops, 5), 0); + MVT::Other, Ops, + sizeof(Ops)/sizeof(SDValue)), 0); Chain = Move.getValue(1); ReplaceUses(N0.getValue(1), Chain); } else { @@ -1456,7 +1459,8 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) { if (foldedLoad) { SDValue Ops[] = { Tmp0, Tmp1, Tmp2, Tmp3, N1.getOperand(0), InFlag }; SDNode *CNode = - CurDAG->getTargetNode(MOpc, dl, MVT::Other, MVT::Flag, Ops, 6); + CurDAG->getTargetNode(MOpc, dl, MVT::Other, MVT::Flag, Ops, + sizeof(Ops)/sizeof(SDValue)); InFlag = SDValue(CNode, 1); // Update the chain. ReplaceUses(N1.getValue(1), SDValue(CNode, 0)); @@ -1599,7 +1603,8 @@ SDNode *X86DAGToDAGISel::Select(SDValue N) { TLI.getPointerTy()); SDValue Ops[] = { Tmp1, Tmp2, Chain }; return CurDAG->getTargetNode(TargetInstrInfo::DECLARE, dl, - MVT::Other, Ops, 3); + MVT::Other, Ops, + sizeof(Ops)/sizeof(SDValue)); } } |
