RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 11:42:57 +01:00
Code Issues Projects Releases Wiki Activity

Bug fix. Flag operand number may be calculated incorrectly.

Browse Source 
llvm-svn: 25465
This commit is contained in:
Evan Cheng 2006-01-19 21:57:10 +00:00
parent 96520cb68d
commit 4a3ee9d5a6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
utils/TableGen/DAGISelEmitter.cpp
View File

@ -2119,12 +2119,22 @@ public:
NodeHasProperty(Pattern, SDNodeInfo::SDNPInFlag, ISE);
bool HasOutFlag = HasImpResults ||
(isRoot && PatternHasProperty(Pattern, SDNodeInfo::SDNPOutFlag, ISE));
bool NodeHasChain =
NodeHasProperty(Pattern, SDNodeInfo::SDNPHasChain, ISE);
bool HasChain = II.hasCtrlDep ||
(isRoot && PatternHasProperty(Pattern, SDNodeInfo::SDNPHasChain, ISE));
if (HasOutFlag || HasInFlag || HasOptInFlag || HasImpInputs)
OS << " SDOperand InFlag = SDOperand(0, 0);\n";
// How many results is this pattern expected to produce?
unsigned NumExpectedResults = 0;
for (unsigned i = 0, e = Pattern->getExtTypes().size(); i != e; i++) {
MVT::ValueType VT = Pattern->getTypeNum(i);
if (VT != MVT::isVoid && VT != MVT::Flag)
NumExpectedResults++;
}
// Determine operand emission order. Complex pattern first.
std::vector<std::pair<unsigned, TreePatternNode*> > EmitOrder;
std::vector<std::pair<unsigned, TreePatternNode*> >::iterator OI;
@ -2163,7 +2173,7 @@ public:
if (HasImpInputs)
EmitCopyToRegs(Pattern, "N", ChainEmitted, true);
if (HasInFlag || HasOptInFlag) {
unsigned FlagNo = (unsigned) HasChain + Pattern->getNumChildren();
unsigned FlagNo = (unsigned) NodeHasChain + Pattern->getNumChildren();
if (HasOptInFlag)
OS << " if (N.getNumOperands() == " << FlagNo+1 << ") ";
else
@ -2237,8 +2247,6 @@ public:
}
// User does not expect that the instruction produces a chain!
bool NodeHasChain =
NodeHasProperty(Pattern, SDNodeInfo::SDNPHasChain, ISE);
bool AddedChain = HasChain && !NodeHasChain;
if (NodeHasChain)
OS << " CodeGenMap[N.getValue(" << ValNo++ << ")] = Chain;\n";
@ -2255,13 +2263,10 @@ public:
OS << " CodeGenMap[N.getValue(" << ValNo << ")] = InFlag;\n";
if (AddedChain && HasOutFlag) {
// Is this pattern expected to produce a result?
if (Pattern->getTypeNum(0) == MVT::isVoid ||
Pattern->getTypeNum(0) == MVT::Flag) {
if (NumExpectedResults == 0) {
OS << " return Result.getValue(N.ResNo+1);\n";
} else {
OS << " if (N.ResNo < "
<< ((NumResults > 1) ? NumResults : 1) << ")\n";
OS << " if (N.ResNo < " << NumExpectedResults << ")\n";
OS << " return Result.getValue(N.ResNo);\n";
OS << " else\n";
OS << " return Result.getValue(N.ResNo+1);\n";