[llvm-commits] CVS: llvm/utils/TableGen/DAGISelEmitter.cpp

[Evan Cheng]

Changes in directory llvm/utils/TableGen:

DAGISelEmitter.cpp updated: 1.104 -> 1.105
---
Log message:

Fix another bug related to chain / flag.


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

 DAGISelEmitter.cpp |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)


Index: llvm/utils/TableGen/DAGISelEmitter.cpp
diff -u llvm/utils/TableGen/DAGISelEmitter.cpp:1.104 llvm/utils/TableGen/DAGISelEmitter.cpp:1.105
--- llvm/utils/TableGen/DAGISelEmitter.cpp:1.104	Mon Dec 19 01:18:51 2005
+++ llvm/utils/TableGen/DAGISelEmitter.cpp	Mon Dec 19 16:40:04 2005
@@ -2107,21 +2107,33 @@
         OS << ");\n";
 
         unsigned ValNo = 0;
-        for (unsigned i = 0; i < NumResults; i++)
-          OS << "      CodeGenMap[N.getValue(" << ValNo++ << ")] = Result;\n";
+        for (unsigned i = 0; i < NumResults; i++) {
+          OS << "      CodeGenMap[N.getValue(" << ValNo << ")] = Result"
+             << ".getValue(" << ValNo << ");\n";
+          ValNo++;
+        }
+
         if (II.hasCtrlDep) {
           OS << "      Chain ";
           if (NodeHasChain(Pattern, ISE))
-            OS << "= CodeGenMap[N.getValue(" << ValNo << ")] ";
+            OS << "= CodeGenMap[N.getValue(" << ValNo + NumImpResults << ")] ";
           for (unsigned j = 0, e = FoldedChains.size(); j < e; j++)
             OS << "= CodeGenMap[" << FoldedChains[j].first << ".getValue("
                << FoldedChains[j].second << ")] ";
-          OS << "= Result.getValue(" << ValNo++ << ");\n";
-        }
-        for (unsigned i = 0; i < NumImpResults; i++) {
-          OS << "      CodeGenMap[N.getValue(" << ValNo << ")] = Result";
-          OS << ".getValue(" << ValNo++ << ");\n";
+          OS << "= Result.getValue(" << ValNo << ");\n";
+          for (unsigned i = 0; i < NumImpResults; i++) {
+            OS << "      CodeGenMap[N.getValue(" << ValNo << ")] = Result";
+            OS << ".getValue(" << ValNo+1 << ");\n";
+            ValNo++;
+          }
+        } else {
+          for (unsigned i = 0; i < NumImpResults; i++) {
+            OS << "      CodeGenMap[N.getValue(" << ValNo << ")] = Result";
+            OS << ".getValue(" << ValNo << ");\n";
+            ValNo++;
+          }
         }
+
         OS << "      return Result.getValue(N.ResNo);\n";
       } else {
         // If this instruction is the root, and if there is only one use of it,