Fix a case where, when trying to track tied operands, we'd accidentally overwrite our mapping.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@136467 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2011-07-29 17:32:03 +00:00
parent 3401a90287
commit d217da1131

View File

@ -1228,10 +1228,8 @@ static bool populateInstruction(const CodeGenInstruction &CGI,
std::map<Init*, std::string> TiedNames; std::map<Init*, std::string> TiedNames;
for (unsigned i = 0; i < CGI.Operands.size(); ++i) { for (unsigned i = 0; i < CGI.Operands.size(); ++i) {
int tiedTo = CGI.Operands[i].getTiedRegister(); int tiedTo = CGI.Operands[i].getTiedRegister();
if (tiedTo != -1) { if (tiedTo != -1)
TiedNames[InOutOperands[i].first] = InOutOperands[tiedTo].second; TiedNames[InOutOperands[i].first] = InOutOperands[tiedTo].second;
TiedNames[InOutOperands[tiedTo].first] = InOutOperands[i].second;
}
} }
// For each operand, see if we can figure out where it is encoded. // For each operand, see if we can figure out where it is encoded.
@ -1267,6 +1265,8 @@ static bool populateInstruction(const CodeGenInstruction &CGI,
unsigned Offset = 0; unsigned Offset = 0;
for (unsigned bi = 0; bi < Bits.getNumBits(); ++bi) { for (unsigned bi = 0; bi < Bits.getNumBits(); ++bi) {
std::string name = NI->second;
std::string altname = TiedNames[NI->first];
VarBitInit *BI = dynamic_cast<VarBitInit*>(Bits.getBit(bi)); VarBitInit *BI = dynamic_cast<VarBitInit*>(Bits.getBit(bi));
if (!BI) { if (!BI) {
if (Base != ~0U) { if (Base != ~0U) {