[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
Chris Lattner
lattner at cs.uiuc.edu
Sun Dec 18 07:36:33 PST 2005
Changes in directory llvm/lib/CodeGen/SelectionDAG:
LegalizeDAG.cpp updated: 1.232 -> 1.233
---
Log message:
More corrections for flagged copyto/from reg
---
Diffs of the changes: (+11 -8)
LegalizeDAG.cpp | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
Index: llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.232 llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.233
--- llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp:1.232 Sun Dec 18 09:27:43 2005
+++ llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Sun Dec 18 09:36:21 2005
@@ -568,15 +568,17 @@
case ISD::CopyFromReg:
Tmp1 = LegalizeOp(Node->getOperand(0));
Result = Op.getValue(0);
- if (Node->getNumOperands() == 2) {
+ if (Node->getNumValues() == 2) {
if (Tmp1 != Node->getOperand(0))
Result = DAG.getCopyFromReg(Tmp1,
cast<RegisterSDNode>(Node->getOperand(1))->getReg(),
Node->getValueType(0));
} else {
- assert(Node->getNumOperands() == 3 && "Invalid copyfromreg!");
- Tmp2 = LegalizeOp(Node->getOperand(2));
- if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2))
+ assert(Node->getNumValues() == 3 && "Invalid copyfromreg!");
+ if (Node->getNumOperands() == 3)
+ Tmp2 = LegalizeOp(Node->getOperand(2));
+ if (Tmp1 != Node->getOperand(0) ||
+ (Node->getNumOperands() == 3 && Tmp2 != Node->getOperand(2)))
Result = DAG.getCopyFromReg(Tmp1,
cast<RegisterSDNode>(Node->getOperand(1))->getReg(),
Node->getValueType(0), Tmp2);
@@ -1140,15 +1142,16 @@
"Register type must be legal!");
// Legalize the incoming value (must be a legal type).
Tmp2 = LegalizeOp(Node->getOperand(2));
- if (Node->getNumOperands() == 3) {
+ if (Node->getNumValues() == 1) {
if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2))
Result = DAG.getNode(ISD::CopyToReg, MVT::Other, Tmp1,
Node->getOperand(1), Tmp2);
} else {
- assert(Node->getNumOperands() == 4 && "Unknown CopyToReg");
- Tmp3 = LegalizeOp(Node->getOperand(3));
+ assert(Node->getNumValues() == 2 && "Unknown CopyToReg");
+ if (Node->getNumOperands() == 4)
+ Tmp3 = LegalizeOp(Node->getOperand(3));
if (Tmp1 != Node->getOperand(0) || Tmp2 != Node->getOperand(2) ||
- Tmp3 != Node->getOperand(3)) {
+ (Node->getNumOperands() == 4 && Tmp3 != Node->getOperand(3))) {
unsigned Reg = cast<RegisterSDNode>(Node->getOperand(1))->getReg();
Result = DAG.getCopyToReg(Tmp1, Reg, Tmp2, Tmp3);
}
More information about the llvm-commits
mailing list