diff options
Diffstat (limited to 'lib/MC')
-rw-r--r-- | lib/MC/MCAtom.cpp | 1 | ||||
-rw-r--r-- | lib/MC/MCFunction.cpp | 16 | ||||
-rw-r--r-- | lib/MC/MCModule.cpp | 27 |
3 files changed, 42 insertions, 2 deletions
diff --git a/lib/MC/MCAtom.cpp b/lib/MC/MCAtom.cpp index f3ea6c344d..17a74687e1 100644 --- a/lib/MC/MCAtom.cpp +++ b/lib/MC/MCAtom.cpp @@ -106,5 +106,6 @@ MCTextAtom *MCTextAtom::split(uint64_t SplitPt) { std::copy(I, Insts.end(), std::back_inserter(RightAtom->Insts)); Insts.erase(I, Insts.end()); + Parent->splitBasicBlocksForAtom(this, RightAtom); return RightAtom; } diff --git a/lib/MC/MCFunction.cpp b/lib/MC/MCFunction.cpp index 300ab5b1a0..85e88e5852 100644 --- a/lib/MC/MCFunction.cpp +++ b/lib/MC/MCFunction.cpp @@ -46,8 +46,9 @@ MCBasicBlock *MCFunction::find(uint64_t StartAddr) { // MCBasicBlock MCBasicBlock::MCBasicBlock(const MCTextAtom &Insts, MCFunction *Parent) - : Insts(&Insts), Parent(Parent) -{} + : Insts(&Insts), Parent(Parent) { + getParent()->getParent()->trackBBForAtom(&Insts, this); +} void MCBasicBlock::addSuccessor(const MCBasicBlock *MCBB) { if (!isSuccessor(MCBB)) @@ -68,3 +69,14 @@ bool MCBasicBlock::isPredecessor(const MCBasicBlock *MCBB) const { return std::find(Predecessors.begin(), Predecessors.end(), MCBB) != Predecessors.end(); } + +void MCBasicBlock::splitBasicBlock(MCBasicBlock *SplitBB) { + assert(Insts->getEndAddr() + 1 == SplitBB->Insts->getBeginAddr() && + "Splitting unrelated basic blocks!"); + SplitBB->addPredecessor(this); + assert(SplitBB->Successors.empty() && + "Split basic block shouldn't already have successors!"); + SplitBB->Successors = Successors; + Successors.clear(); + addSuccessor(SplitBB); +} diff --git a/lib/MC/MCModule.cpp b/lib/MC/MCModule.cpp index bdd5cc6b1c..7e9e18a5a9 100644 --- a/lib/MC/MCModule.cpp +++ b/lib/MC/MCModule.cpp @@ -103,6 +103,33 @@ MCFunction *MCModule::createFunction(StringRef Name) { 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(); |