diff options
author | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2013-08-21 07:27:55 +0000 |
---|---|---|
committer | Ahmed Bougacha <ahmed.bougacha@gmail.com> | 2013-08-21 07:27:55 +0000 |
commit | 7dac32d07d54231ba203f7c32f3a9f8e6730810f (patch) | |
tree | 080adb227055f57d1b5213027ab06746dcaf8b6e | |
parent | dca54eab53fe5d6d203adaa5ea3004586fc3c093 (diff) | |
download | external_llvm-7dac32d07d54231ba203f7c32f3a9f8e6730810f.zip external_llvm-7dac32d07d54231ba203f7c32f3a9f8e6730810f.tar.gz external_llvm-7dac32d07d54231ba203f7c32f3a9f8e6730810f.tar.bz2 |
MC CFG: Keep pointer to parent MCModule in created MCFunctions.
Also, drive-by cleaning around createFunction.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188875 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/MC/MCFunction.h | 7 | ||||
-rw-r--r-- | include/llvm/MC/MCModule.h | 5 | ||||
-rw-r--r-- | lib/MC/MCFunction.cpp | 6 | ||||
-rw-r--r-- | lib/MC/MCModule.cpp | 8 |
4 files changed, 16 insertions, 10 deletions
diff --git a/include/llvm/MC/MCFunction.h b/include/llvm/MC/MCFunction.h index b85011e..4c75cd4 100644 --- a/include/llvm/MC/MCFunction.h +++ b/include/llvm/MC/MCFunction.h @@ -74,21 +74,22 @@ public: }; /// \brief Represents a function in machine code, containing MCBasicBlocks. -/// MCFunctions are created using MCModule::createFunction. +/// MCFunctions are created by MCModule. class MCFunction { MCFunction (const MCFunction&) LLVM_DELETED_FUNCTION; MCFunction& operator=(const MCFunction&) LLVM_DELETED_FUNCTION; std::string Name; + MCModule *ParentModule; typedef std::vector<MCBasicBlock*> BasicBlockListTy; BasicBlockListTy Blocks; // MCModule owns the function. friend class MCModule; - MCFunction(StringRef Name); -public: + MCFunction(StringRef Name, MCModule *Parent); ~MCFunction(); +public: /// \brief Create an MCBasicBlock backed by Insts and add it to this function. /// \param Insts Sequence of straight-line code backing the basic block. /// \returns The newly created basic block. diff --git a/include/llvm/MC/MCModule.h b/include/llvm/MC/MCModule.h index 02f8ca0..6d49362 100644 --- a/include/llvm/MC/MCModule.h +++ b/include/llvm/MC/MCModule.h @@ -23,6 +23,7 @@ namespace llvm { class MCAtom; +class MCBasicBlock; class MCDataAtom; class MCFunction; class MCObjectDisassembler; @@ -88,8 +89,8 @@ public: atom_iterator atom_end() { return Atoms.end(); } /// @} - /// \name Create a new MCFunction. - MCFunction *createFunction(const StringRef &Name); + /// \brief Create a new MCFunction. + MCFunction *createFunction(StringRef Name); /// \name Access to the owned function list. /// @{ diff --git a/lib/MC/MCFunction.cpp b/lib/MC/MCFunction.cpp index 473d07b..cb25046 100644 --- a/lib/MC/MCFunction.cpp +++ b/lib/MC/MCFunction.cpp @@ -9,15 +9,15 @@ #include "llvm/MC/MCFunction.h" #include "llvm/MC/MCAtom.h" -#include "llvm/Support/raw_ostream.h" +#include "llvm/MC/MCModule.h" #include <algorithm> using namespace llvm; // MCFunction -MCFunction::MCFunction(StringRef Name) - : Name(Name) +MCFunction::MCFunction(StringRef Name, MCModule *Parent) + : Name(Name), ParentModule(Parent) {} MCFunction::~MCFunction() { diff --git a/lib/MC/MCModule.cpp b/lib/MC/MCModule.cpp index 5890b4b..9a9d90e 100644 --- a/lib/MC/MCModule.cpp +++ b/lib/MC/MCModule.cpp @@ -54,9 +54,13 @@ void MCModule::remap(MCAtom *Atom, uint64_t NewBegin, uint64_t NewEnd) { assert(*I == Atom && "Previous atom mapping was invalid!"); Atoms.erase(I); + // FIXME: special case NewBegin == Atom->Begin + // Insert the new mapping. 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. @@ -80,8 +84,8 @@ MCAtom *MCModule::findAtomContaining(uint64_t Addr) { return 0; } -MCFunction *MCModule::createFunction(const StringRef &Name) { - Functions.push_back(new MCFunction(Name)); +MCFunction *MCModule::createFunction(StringRef Name) { + Functions.push_back(new MCFunction(Name, this)); return Functions.back(); } |