6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 05:32:25 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[TableGen] Implement at least some support for multiple explicit results in an instruction pattern. No functional change to existing patterns."

Browse Source 
This is failing on several build bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231358 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Craig Topper 2015-03-05 07:17:52 +00:00
parent 256cb3b576
commit bc55462859
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/TableGen/CodeGenDAGPatterns.cpp
View File

@ -1222,7 +1222,8 @@ static unsigned GetNumNodeResults(Record *Operator, CodeGenDAGPatterns &CDP) {
if (Operator->isSubClassOf("Instruction")) { if (Operator->isSubClassOf("Instruction")) {
CodeGenInstruction &InstInfo = CDP.getTargetInfo().getInstruction(Operator); CodeGenInstruction &InstInfo = CDP.getTargetInfo().getInstruction(Operator);
unsigned NumDefsToAdd = InstInfo.Operands.NumDefs; // FIXME: Should allow access to all the results here.
unsigned NumDefsToAdd = InstInfo.Operands.NumDefs ? 1 : 0;
// Add on one implicit def if it has a resolvable type. // Add on one implicit def if it has a resolvable type.
if (InstInfo.HasOneImplicitDefWithKnownVT(CDP.getTargetInfo()) !=MVT::Other) if (InstInfo.HasOneImplicitDefWithKnownVT(CDP.getTargetInfo()) !=MVT::Other)
@ -1799,7 +1800,8 @@ bool TreePatternNode::ApplyTypeConstraints(TreePattern &TP, bool NotRegisters) {
// Apply the result types to the node, these come from the things in the // Apply the result types to the node, these come from the things in the
// (outs) list of the instruction. // (outs) list of the instruction.
unsigned NumResultsToAdd = InstInfo.Operands.NumDefs; // FIXME: Cap at one result so far.
unsigned NumResultsToAdd = InstInfo.Operands.NumDefs ? 1 : 0;
for (unsigned ResNo = 0; ResNo != NumResultsToAdd; ++ResNo) for (unsigned ResNo = 0; ResNo != NumResultsToAdd; ++ResNo)
MadeChange |= UpdateNodeTypeFromInst(ResNo, Inst.getResult(ResNo), TP); MadeChange |= UpdateNodeTypeFromInst(ResNo, Inst.getResult(ResNo), TP);
@ -2965,7 +2967,7 @@ const DAGInstruction &CodeGenDAGPatterns::parseInstructionPattern(
// Check that all of the results occur first in the list. // Check that all of the results occur first in the list.
std::vector<Record*> Results; std::vector<Record*> Results;
SmallVector<TreePatternNode *, 2> ResNodes; TreePatternNode *Res0Node = nullptr;
for (unsigned i = 0; i != NumResults; ++i) { for (unsigned i = 0; i != NumResults; ++i) {
if (i == CGI.Operands.size()) if (i == CGI.Operands.size())
I->error("'" + InstResults.begin()->first + I->error("'" + InstResults.begin()->first +
@ -2977,8 +2979,8 @@ const DAGInstruction &CodeGenDAGPatterns::parseInstructionPattern(
if (!RNode) if (!RNode)
I->error("Operand $" + OpName + " does not exist in operand list!"); I->error("Operand $" + OpName + " does not exist in operand list!");
ResNodes.push_back(RNode); if (i == 0)
Res0Node = RNode;
Record *R = cast<DefInit>(RNode->getLeafValue())->getDef(); Record *R = cast<DefInit>(RNode->getLeafValue())->getDef();
if (!R) if (!R)
I->error("Operand $" + OpName + " should be a set destination: all " I->error("Operand $" + OpName + " should be a set destination: all "
@ -3053,11 +3055,9 @@ const DAGInstruction &CodeGenDAGPatterns::parseInstructionPattern(
TreePatternNode *ResultPattern = TreePatternNode *ResultPattern =
new TreePatternNode(I->getRecord(), ResultNodeOperands, new TreePatternNode(I->getRecord(), ResultNodeOperands,
GetNumNodeResults(I->getRecord(), *this)); GetNumNodeResults(I->getRecord(), *this));
// Copy fully inferred output node types to instruction result pattern. // Copy fully inferred output node type to instruction result pattern.
for (unsigned i = 0; i != NumResults; ++i) { for (unsigned i = 0; i != NumResults; ++i)
assert(ResNodes[i]->getNumTypes() == 1 && "FIXME: Unhandled"); ResultPattern->setType(i, Res0Node->getExtType(i));
ResultPattern->setType(i, ResNodes[i]->getExtType(0));
}
// Create and insert the instruction. // Create and insert the instruction.
// FIXME: InstImpResults should not be part of DAGInstruction. // FIXME: InstImpResults should not be part of DAGInstruction.