XFAIL this completely at the moment:

[oota-llvm.git] / lib / MC / MCModule.cpp

diff --git a/lib/MC/MCModule.cpp b/lib/MC/MCModule.cpp
index b09fbb51c8574ce9d51671ca353bb3814e3eecd9..7e9e18a5a917dfff8f495ecc86d62ec78186d9cb 100644 (file)
--- a/lib/MC/MCModule.cpp
+++ b/lib/MC/MCModule.cpp
@@ -14,19 +14,12 @@
 
 using namespace llvm;
 
-static bool AtomComp(const MCAtom *LHS, const MCAtom *RHS) {
-  return LHS->getEndAddr() < RHS->getEndAddr();
+static bool AtomComp(const MCAtom *L, uint64_t Addr) {
+  return L->getEndAddr() < Addr;
 }
 
-MCModule::const_atom_iterator MCModule::atom_lower_bound(uint64_t Addr) const {
-  // This is a dummy atom, because VS 2008 doesn't like asymmetric comparators.
-  MCDataAtom AddrAtom(0, Addr, Addr);
-  return std::lower_bound(atom_begin(), atom_end(), &AddrAtom, AtomComp);
-}
-
-MCModule::atom_iterator MCModule::atom_lower_bound(uint64_t Addr) {
-  MCDataAtom AddrAtom(0, Addr, Addr);
-  return std::lower_bound(atom_begin(), atom_end(), &AddrAtom, AtomComp);
+static bool AtomCompInv(uint64_t Addr, const MCAtom *R) {
+  return Addr < R->getEndAddr();
 }
 
 void MCModule::map(MCAtom *NewAtom) {
@@ -35,7 +28,8 @@ void MCModule::map(MCAtom *NewAtom) {
   assert(Begin <= NewAtom->End && "Creating MCAtom with endpoints reversed?");
 
   // Check for atoms already covering this range.
-  AtomListTy::iterator I = atom_lower_bound(Begin);
+  AtomListTy::iterator I = std::lower_bound(atom_begin(), atom_end(),
+                                            Begin, AtomComp);
   assert((I == atom_end() || (*I)->getBeginAddr() > NewAtom->End)
          && "Offset range already occupied!");
 
@@ -58,13 +52,19 @@ MCDataAtom *MCModule::createDataAtom(uint64_t Begin, uint64_t End) {
 // remap - Update the interval mapping for an atom.
 void MCModule::remap(MCAtom *Atom, uint64_t NewBegin, uint64_t NewEnd) {
   // Find and erase the old mapping.
-  AtomListTy::iterator I = atom_lower_bound(Atom->Begin);
+  AtomListTy::iterator I = std::lower_bound(atom_begin(), atom_end(),
+                                            Atom->Begin, AtomComp);
   assert(I != atom_end() && "Atom offset not found in module!");
   assert(*I == Atom && "Previous atom mapping was invalid!");
   Atoms.erase(I);
 
+  // FIXME: special case NewBegin == Atom->Begin
+
   // Insert the new mapping.
-  AtomListTy::iterator NewI = atom_lower_bound(NewBegin);
+  AtomListTy::iterator NewI = std::lower_bound(atom_begin(), atom_end(),
+                                               NewBegin, AtomComp);
+  assert((NewI == atom_end() || (*NewI)->getBeginAddr() > Atom->End)
+         && "Offset range already occupied!");
   Atoms.insert(NewI, Atom);
 
   // Update the atom internal bounds.
@@ -73,24 +73,63 @@ void MCModule::remap(MCAtom *Atom, uint64_t NewBegin, uint64_t NewEnd) {
 }
 
 const MCAtom *MCModule::findAtomContaining(uint64_t Addr) const {
-  AtomListTy::const_iterator I = atom_lower_bound(Addr);
+  AtomListTy::const_iterator I = std::lower_bound(atom_begin(), atom_end(),
+                                                  Addr, AtomComp);
   if (I != atom_end() && (*I)->getBeginAddr() <= Addr)
     return *I;
   return 0;
 }
 
 MCAtom *MCModule::findAtomContaining(uint64_t Addr) {
-  AtomListTy::iterator I = atom_lower_bound(Addr);
-  if (I != atom_end() && (*I)->getBeginAddr() <= Addr)
+  return const_cast<MCAtom*>(
+    const_cast<const MCModule *>(this)->findAtomContaining(Addr));
+}
+
+const MCAtom *MCModule::findFirstAtomAfter(uint64_t Addr) const {
+  AtomListTy::const_iterator I = std::upper_bound(atom_begin(), atom_end(),
+                                                  Addr, AtomCompInv);
+  if (I != atom_end())
     return *I;
   return 0;
 }
 
-MCFunction *MCModule::createFunction(const StringRef &Name) {
-  Functions.push_back(new MCFunction(Name));
+MCAtom *MCModule::findFirstAtomAfter(uint64_t Addr) {
+  return const_cast<MCAtom*>(
+    const_cast<const MCModule *>(this)->findFirstAtomAfter(Addr));
+}
+
+MCFunction *MCModule::createFunction(StringRef Name) {
+  Functions.push_back(new MCFunction(Name, this));
   return Functions.back();
 }
 
+static bool CompBBToAtom(MCBasicBlock *BB, const MCTextAtom *Atom) {
+  return BB->getInsts() < Atom;
+}
+
+void MCModule::splitBasicBlocksForAtom(const MCTextAtom *TA,
+                                       const MCTextAtom *NewTA) {
+  BBsByAtomTy::iterator
+    I = std::lower_bound(BBsByAtom.begin(), BBsByAtom.end(),
+                         TA, CompBBToAtom);
+  for (; I != BBsByAtom.end() && (*I)->getInsts() == TA; ++I) {
+    MCBasicBlock *BB = *I;
+    MCBasicBlock *NewBB = &BB->getParent()->createBlock(*NewTA);
+    BB->splitBasicBlock(NewBB);
+  }
+}
+
+void MCModule::trackBBForAtom(const MCTextAtom *Atom, MCBasicBlock *BB) {
+  assert(Atom == BB->getInsts() && "Text atom doesn't back the basic block!");
+  BBsByAtomTy::iterator I = std::lower_bound(BBsByAtom.begin(),
+                                             BBsByAtom.end(),
+                                             Atom, CompBBToAtom);
+  for (; I != BBsByAtom.end() && (*I)->getInsts() == Atom; ++I)
+    if (*I == BB)
+      return;
+  BBsByAtom.insert(I, BB);
+}
+
 MCModule::~MCModule() {
   for (AtomListTy::iterator AI = atom_begin(),
                             AE = atom_end();