6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-27 16:17:17 +00:00
Code Issues Projects Releases Wiki Activity

Copy matching pattern's output type info to instruction result pattern.

Browse Source 
The instruction patterns do not contain enough information to resolve the
exact type of the destination if it of a generic vector type.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26892 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Evan Cheng
2006-03-20 06:04:09 +00:00
parent fa818d0b8b
commit 420132e1eb
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
utils/TableGen/DAGISelEmitter.cpp
View File

@@ -1105,7 +1105,7 @@ static bool HandleUse(TreePattern *I, TreePatternNode *Pat,
void DAGISelEmitter:: void DAGISelEmitter::
FindPatternInputsAndOutputs(TreePattern *I, TreePatternNode *Pat, FindPatternInputsAndOutputs(TreePattern *I, TreePatternNode *Pat,
std::map<std::string, TreePatternNode*> &InstInputs, std::map<std::string, TreePatternNode*> &InstInputs,
std::map<std::string, Record*> &InstResults, std::map<std::string, TreePatternNode*> &InstResults,
std::vector<Record*> &InstImpInputs, std::vector<Record*> &InstImpInputs,
std::vector<Record*> &InstImpResults) { std::vector<Record*> &InstImpResults) {
if (Pat->isLeaf()) { if (Pat->isLeaf()) {
@@ -1159,7 +1159,7 @@ FindPatternInputsAndOutputs(TreePattern *I, TreePatternNode *Pat,
I->error("set destination must have a name!"); I->error("set destination must have a name!");
if (InstResults.count(Dest->getName())) if (InstResults.count(Dest->getName()))
I->error("cannot set '" + Dest->getName() +"' multiple times"); I->error("cannot set '" + Dest->getName() +"' multiple times");
InstResults[Dest->getName()] = Val->getDef(); InstResults[Dest->getName()] = Dest;
} else if (Val->getDef()->isSubClassOf("Register")) { } else if (Val->getDef()->isSubClassOf("Register")) {
InstImpResults.push_back(Val->getDef()); InstImpResults.push_back(Val->getDef());
} else { } else {
@@ -1235,7 +1235,7 @@ void DAGISelEmitter::ParseInstructions() {
// InstResults - Keep track of all the virtual registers that are 'set' // InstResults - Keep track of all the virtual registers that are 'set'
// in the instruction, including what reg class they are. // in the instruction, including what reg class they are.
std::map<std::string, Record*> InstResults; std::map<std::string, TreePatternNode*> InstResults;
std::vector<Record*> InstImpInputs; std::vector<Record*> InstImpInputs;
std::vector<Record*> InstImpResults; std::vector<Record*> InstImpResults;
@@ -1265,6 +1265,7 @@ void DAGISelEmitter::ParseInstructions() {
// 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;
TreePatternNode *Res0Node = NULL;
for (unsigned i = 0; i != NumResults; ++i) { for (unsigned i = 0; i != NumResults; ++i) {
if (i == CGI.OperandList.size()) if (i == CGI.OperandList.size())
I->error("'" + InstResults.begin()->first + I->error("'" + InstResults.begin()->first +
@@ -1272,7 +1273,10 @@ void DAGISelEmitter::ParseInstructions() {
const std::string &OpName = CGI.OperandList[i].Name; const std::string &OpName = CGI.OperandList[i].Name;
// Check that it exists in InstResults. // Check that it exists in InstResults.
Record *R = InstResults[OpName]; TreePatternNode *RNode = InstResults[OpName];
if (i == 0)
Res0Node = RNode;
Record *R = dynamic_cast<DefInit*>(RNode->getLeafValue())->getDef();
if (R == 0) if (R == 0)
I->error("Operand $" + OpName + " should be a set destination: all " I->error("Operand $" + OpName + " should be a set destination: all "
"outputs must occur before inputs in operand list!"); "outputs must occur before inputs in operand list!");
@@ -1337,6 +1341,9 @@ void DAGISelEmitter::ParseInstructions() {
TreePatternNode *ResultPattern = TreePatternNode *ResultPattern =
new TreePatternNode(I->getRecord(), ResultNodeOperands); new TreePatternNode(I->getRecord(), ResultNodeOperands);
// Copy fully inferred output node type to instruction result pattern.
if (NumResults > 0)
ResultPattern->setTypes(Res0Node->getExtTypes());
// Create and insert the instruction. // Create and insert the instruction.
DAGInstruction TheInst(I, Results, Operands, InstImpResults, InstImpInputs); DAGInstruction TheInst(I, Results, Operands, InstImpResults, InstImpInputs);
@@ -1407,7 +1414,7 @@ void DAGISelEmitter::ParsePatterns() {
// Validate that the input pattern is correct. // Validate that the input pattern is correct.
{ {
std::map<std::string, TreePatternNode*> InstInputs; std::map<std::string, TreePatternNode*> InstInputs;
std::map<std::string, Record*> InstResults; std::map<std::string, TreePatternNode*> InstResults;
std::vector<Record*> InstImpInputs; std::vector<Record*> InstImpInputs;
std::vector<Record*> InstImpResults; std::vector<Record*> InstImpResults;
FindPatternInputsAndOutputs(Pattern, Pattern->getOnlyTree(), FindPatternInputsAndOutputs(Pattern, Pattern->getOnlyTree(),

3
utils/TableGen/DAGISelEmitter.h
View File

@@ -469,7 +469,8 @@ private:
void FindPatternInputsAndOutputs(TreePattern *I, TreePatternNode *Pat, void FindPatternInputsAndOutputs(TreePattern *I, TreePatternNode *Pat,
std::map<std::string, std::map<std::string,
TreePatternNode*> &InstInputs, TreePatternNode*> &InstInputs,
std::map<std::string, Record*> &InstResults, std::map<std::string,
TreePatternNode*> &InstResults,
std::vector<Record*> &InstImpInputs, std::vector<Record*> &InstImpInputs,
std::vector<Record*> &InstImpResults); std::vector<Record*> &InstImpResults);
void GenerateCodeForPattern(PatternToMatch &Pattern, void GenerateCodeForPattern(PatternToMatch &Pattern,