[llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.28 -> 1.29
---
Log message:

Add some very paranoid checking for operand/result reg class matchup
For instructions that define multiple results, use the right regclass
to define the result, not always the rc of result #0


---
Diffs of the changes:  (+20 -3)

 ScheduleDAG.cpp |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.28 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.29
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.28	Fri Sep 30 19:08:23 2005
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Sat Oct  1 02:45:09 2005
@@ -909,7 +909,7 @@
   MI->addRegOperand(ResultReg, MachineOperand::Def);
   for (unsigned i = 1; i != NumResults; ++i) {
     assert(OpInfo[i].RegClass && "Isn't a register operand!");
-    MI->addRegOperand(RegMap->createVirtualRegister(OpInfo[0].RegClass),
+    MI->addRegOperand(RegMap->createVirtualRegister(OpInfo[i].RegClass),
                       MachineOperand::Def);
   }
   return ResultReg;
@@ -951,8 +951,17 @@
         assert(Node->getOperand(i).getValueType() != MVT::Other &&
                Node->getOperand(i).getValueType() != MVT::Flag &&
                "Chain and flag operands should occur at end of operand list!");
+
+        // Get/emit the operand.
+        unsigned VReg = getVR(Node->getOperand(i));
+        MI->addRegOperand(VReg, MachineOperand::Use);
         
-        MI->addRegOperand(getVR(Node->getOperand(i)), MachineOperand::Use);
+        // Verify that it is right.
+        assert(MRegisterInfo::isVirtualRegister(VReg) && "Not a vreg?");
+        assert(II.OpInfo[i+NumResults].RegClass &&
+               "Don't have operand info for this instruction!");
+        assert(RegMap->getRegClass(VReg) == II.OpInfo[i+NumResults].RegClass &&
+               "Register class of operand and regclass of use don't agree!");
       } else if (ConstantSDNode *C =
                  dyn_cast<ConstantSDNode>(Node->getOperand(i))) {
         MI->addZeroExtImm64Operand(C->getValue());
@@ -979,7 +988,15 @@
         assert(Node->getOperand(i).getValueType() != MVT::Other &&
                Node->getOperand(i).getValueType() != MVT::Flag &&
                "Chain and flag operands should occur at end of operand list!");
-        MI->addRegOperand(getVR(Node->getOperand(i)), MachineOperand::Use);
+        unsigned VReg = getVR(Node->getOperand(i));
+        MI->addRegOperand(VReg, MachineOperand::Use);
+        
+        // Verify that it is right.
+        assert(MRegisterInfo::isVirtualRegister(VReg) && "Not a vreg?");
+        assert(II.OpInfo[i+NumResults].RegClass &&
+               "Don't have operand info for this instruction!");
+        assert(RegMap->getRegClass(VReg) == II.OpInfo[i+NumResults].RegClass &&
+               "Register class of operand and regclass of use don't agree!");
       }
     }