mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-13 20:32:21 +00:00
rewrite this to not artificially force concat the ins/outs list.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98870 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
b7d5226a4e
commit
f55eed299b
@ -127,30 +127,37 @@ CodeGenInstruction::CodeGenInstruction(Record *R, const std::string &AsmStr)
|
|||||||
if (neverHasSideEffects + hasSideEffects > 1)
|
if (neverHasSideEffects + hasSideEffects > 1)
|
||||||
throw R->getName() + ": multiple conflicting side-effect flags set!";
|
throw R->getName() + ": multiple conflicting side-effect flags set!";
|
||||||
|
|
||||||
DagInit *DI = R->getValueAsDag("OutOperandList");
|
DagInit *OutDI = R->getValueAsDag("OutOperandList");
|
||||||
|
|
||||||
if (DefInit *Init = dynamic_cast<DefInit*>(DI->getOperator())) {
|
if (DefInit *Init = dynamic_cast<DefInit*>(OutDI->getOperator())) {
|
||||||
if (Init->getDef()->getName() != "outs")
|
if (Init->getDef()->getName() != "outs")
|
||||||
throw R->getName() + ": invalid def name for output list: use 'outs'";
|
throw R->getName() + ": invalid def name for output list: use 'outs'";
|
||||||
} else
|
} else
|
||||||
throw R->getName() + ": invalid output list: use 'outs'";
|
throw R->getName() + ": invalid output list: use 'outs'";
|
||||||
|
|
||||||
NumDefs = DI->getNumArgs();
|
NumDefs = OutDI->getNumArgs();
|
||||||
|
|
||||||
DagInit *IDI = R->getValueAsDag("InOperandList");
|
DagInit *InDI = R->getValueAsDag("InOperandList");
|
||||||
if (DefInit *Init = dynamic_cast<DefInit*>(IDI->getOperator())) {
|
if (DefInit *Init = dynamic_cast<DefInit*>(InDI->getOperator())) {
|
||||||
if (Init->getDef()->getName() != "ins")
|
if (Init->getDef()->getName() != "ins")
|
||||||
throw R->getName() + ": invalid def name for input list: use 'ins'";
|
throw R->getName() + ": invalid def name for input list: use 'ins'";
|
||||||
} else
|
} else
|
||||||
throw R->getName() + ": invalid input list: use 'ins'";
|
throw R->getName() + ": invalid input list: use 'ins'";
|
||||||
|
|
||||||
DI = (DagInit*)(new BinOpInit(BinOpInit::CONCAT,
|
|
||||||
DI, IDI, new DagRecTy))->Fold(R, 0);
|
|
||||||
|
|
||||||
unsigned MIOperandNo = 0;
|
unsigned MIOperandNo = 0;
|
||||||
std::set<std::string> OperandNames;
|
std::set<std::string> OperandNames;
|
||||||
for (unsigned i = 0, e = DI->getNumArgs(); i != e; ++i) {
|
for (unsigned i = 0, e = InDI->getNumArgs()+OutDI->getNumArgs(); i != e; ++i){
|
||||||
DefInit *Arg = dynamic_cast<DefInit*>(DI->getArg(i));
|
Init *ArgInit;
|
||||||
|
std::string ArgName;
|
||||||
|
if (i < NumDefs) {
|
||||||
|
ArgInit = OutDI->getArg(i);
|
||||||
|
ArgName = OutDI->getArgName(i);
|
||||||
|
} else {
|
||||||
|
ArgInit = InDI->getArg(i-NumDefs);
|
||||||
|
ArgName = InDI->getArgName(i-NumDefs);
|
||||||
|
}
|
||||||
|
|
||||||
|
DefInit *Arg = dynamic_cast<DefInit*>(ArgInit);
|
||||||
if (!Arg)
|
if (!Arg)
|
||||||
throw "Illegal operand for the '" + R->getName() + "' instruction!";
|
throw "Illegal operand for the '" + R->getName() + "' instruction!";
|
||||||
|
|
||||||
@ -187,14 +194,14 @@ CodeGenInstruction::CodeGenInstruction(Record *R, const std::string &AsmStr)
|
|||||||
"' in '" + R->getName() + "' instruction!";
|
"' in '" + R->getName() + "' instruction!";
|
||||||
|
|
||||||
// Check that the operand has a name and that it's unique.
|
// Check that the operand has a name and that it's unique.
|
||||||
if (DI->getArgName(i).empty())
|
if (ArgName.empty())
|
||||||
throw "In instruction '" + R->getName() + "', operand #" + utostr(i) +
|
throw "In instruction '" + R->getName() + "', operand #" + utostr(i) +
|
||||||
" has no name!";
|
" has no name!";
|
||||||
if (!OperandNames.insert(DI->getArgName(i)).second)
|
if (!OperandNames.insert(ArgName).second)
|
||||||
throw "In instruction '" + R->getName() + "', operand #" + utostr(i) +
|
throw "In instruction '" + R->getName() + "', operand #" + utostr(i) +
|
||||||
" has the same name as a previous operand!";
|
" has the same name as a previous operand!";
|
||||||
|
|
||||||
OperandList.push_back(OperandInfo(Rec, DI->getArgName(i), PrintMethod,
|
OperandList.push_back(OperandInfo(Rec, ArgName, PrintMethod,
|
||||||
MIOperandNo, NumOps, MIOpInfo));
|
MIOperandNo, NumOps, MIOpInfo));
|
||||||
MIOperandNo += NumOps;
|
MIOperandNo += NumOps;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user