diff options
| -rw-r--r-- | utils/TableGen/DAGISelEmitter.cpp | 11 | ||||
| -rw-r--r-- | utils/TableGen/DAGISelEmitter.h | 21 |
2 files changed, 24 insertions, 8 deletions
diff --git a/utils/TableGen/DAGISelEmitter.cpp b/utils/TableGen/DAGISelEmitter.cpp index 95a7ca070b..7418435bab 100644 --- a/utils/TableGen/DAGISelEmitter.cpp +++ b/utils/TableGen/DAGISelEmitter.cpp @@ -700,18 +700,19 @@ void DAGISelEmitter::ParseAndResolveInstructions() { // Now that we have operands that are sets, inspect the operands list for // the instruction. This determines the order that operands are added to // the machine instruction the node corresponds to. - assert(SetDestinations.size() == 1 && + unsigned NumResults = SetDestinations.size(); + assert(NumResults == 1 && "This code only handles a single set right now!"); - + unsigned NumOperands = 0; DEBUG(I->dump()); - Instructions.push_back(I); + Instructions.push_back(DAGInstruction(I, NumResults, NumOperands)); } // If we can, convert the instructions to be a patterns that are matched! for (unsigned i = 0, e = Instructions.size(); i != e; ++i) { - TreePattern *I = Instructions[i]; + TreePattern *I = Instructions[i].getPattern(); if (I->getNumTrees() != 1) { std::cerr << "CANNOT HANDLE: " << I->getRecord()->getName() << " yet!"; @@ -780,7 +781,5 @@ void DAGISelEmitter::run(std::ostream &OS) { delete I->second; PatternFragments.clear(); - for (unsigned i = 0, e = Instructions.size(); i != e; ++i) - delete Instructions[i]; Instructions.clear(); } diff --git a/utils/TableGen/DAGISelEmitter.h b/utils/TableGen/DAGISelEmitter.h index a2409bb855..3c61224bb8 100644 --- a/utils/TableGen/DAGISelEmitter.h +++ b/utils/TableGen/DAGISelEmitter.h @@ -272,7 +272,24 @@ namespace llvm { MVT::ValueType getIntrinsicType(Record *R) const; TreePatternNode *ParseTreePattern(DagInit *DI); }; - + + + class DAGInstruction { + TreePattern *Pattern; + unsigned NumResults; + unsigned NumOperands; + public: + DAGInstruction(TreePattern *TP, unsigned results, unsigned ops) + : Pattern(TP), NumResults(results), NumOperands(ops) {} + + ~DAGInstruction() { + delete Pattern; + } + + TreePattern *getPattern() const { return Pattern; } + unsigned getNumResults() const { return NumResults; } + unsigned getNumOperands() const { return NumOperands; } + }; /// InstrSelectorEmitter - The top-level class which coordinates construction @@ -285,7 +302,7 @@ class DAGISelEmitter : public TableGenBackend { std::map<Record*, SDNodeInfo> SDNodes; std::map<Record*, std::pair<Record*, std::string> > SDNodeXForms; std::map<Record*, TreePattern*> PatternFragments; - std::vector<TreePattern*> Instructions; + std::vector<DAGInstruction> Instructions; /// PatternsToMatch - All of the things we are matching on the DAG. The first /// value is the pattern to match, the second pattern is the result to |