maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Resolve unfold tables ambiguity. 

llvm-svn: 43194
This commit is contained in:
Evan Cheng 2007-10-19 23:50:58 +00:00
parent f52a6fc50c
commit 45e096c77e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llvm/lib/Target/X86/X86RegisterInfo.cpp
View File

@ -324,9 +324,10 @@ X86RegisterInfo::X86RegisterInfo(X86TargetMachine &tm,
unsigned FoldedLoad = OpTbl0[i][2]; unsigned FoldedLoad = OpTbl0[i][2];
// Index 0, folded load or store. // Index 0, folded load or store.
unsigned AuxInfo = 0 | (FoldedLoad << 4) | ((FoldedLoad^1) << 5); unsigned AuxInfo = 0 | (FoldedLoad << 4) | ((FoldedLoad^1) << 5);
if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, if (RegOp != X86::FsMOVAPDrr && RegOp != X86::FsMOVAPSrr)
if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp,
std::make_pair(RegOp, AuxInfo)))) std::make_pair(RegOp, AuxInfo))))
AmbEntries.push_back(MemOp); AmbEntries.push_back(MemOp);
} }
static const unsigned OpTbl1[][2] = { static const unsigned OpTbl1[][2] = {
@ -449,9 +450,10 @@ X86RegisterInfo::X86RegisterInfo(X86TargetMachine &tm,
if (!RegOp2MemOpTable1.insert(std::make_pair((unsigned*)RegOp, MemOp))) if (!RegOp2MemOpTable1.insert(std::make_pair((unsigned*)RegOp, MemOp)))
assert(false && "Duplicated entries?"); assert(false && "Duplicated entries?");
unsigned AuxInfo = 1 | (1 << 4); // Index 1, folded load unsigned AuxInfo = 1 | (1 << 4); // Index 1, folded load
if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp, if (RegOp != X86::FsMOVAPDrr && RegOp != X86::FsMOVAPSrr)
if (!MemOp2RegOpTable.insert(std::make_pair((unsigned*)MemOp,
std::make_pair(RegOp, AuxInfo)))) std::make_pair(RegOp, AuxInfo))))
AmbEntries.push_back(MemOp); AmbEntries.push_back(MemOp);
} }
static const unsigned OpTbl2[][2] = { static const unsigned OpTbl2[][2] = {
@ -648,8 +650,7 @@ X86RegisterInfo::X86RegisterInfo(X86TargetMachine &tm,
} }
// Remove ambiguous entries. // Remove ambiguous entries.
for (unsigned i = 0, e = AmbEntries.size(); i != e; ++i) assert(AmbEntries.empty() && "Duplicated entries in unfolding maps?");
MemOp2RegOpTable.erase((unsigned*)AmbEntries[i]);
} }
// getX86RegNum - This function maps LLVM register identifiers to their X86 // getX86RegNum - This function maps LLVM register identifiers to their X86