6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-23 02:29:18 +00:00
Code Issues Projects Releases Wiki Activity

MC CFG: Add a few needed methods, mainly MCModule::findFirstAtomAfter.

Browse Source 
While there, do some minor cleanup.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@188880 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ahmed Bougacha 2013-08-21 07:28:17 +00:00
parent 9bfc0626c0
commit 46d353f8e8
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/MC/MCFunction.h
View File

@ -97,6 +97,12 @@ public:
StringRef getName() const { return Name; }
/// \name Get the owning MC Module.
/// @{
const MCModule *getParent() const { return ParentModule; }
MCModule *getParent() { return ParentModule; }
/// @}
/// \name Access to the function's basic blocks. No ordering is enforced,
/// except that the first block is the entry block.
/// @{

4
include/llvm/MC/MCModule.h
View File

@ -43,7 +43,9 @@ class MCModule {
typedef std::vector<MCAtom*> AtomListTy;
AtomListTy Atoms;
// For access to map/remap.
friend class MCAtom;
/// \brief Remap \p Atom to the given range, and update its Begin/End fields.
/// \param Atom An atom belonging to this module.
/// An atom should always use this method to update its bounds, because this
@ -83,6 +85,8 @@ public:
/// @{
const MCAtom *findAtomContaining(uint64_t Addr) const;
MCAtom *findAtomContaining(uint64_t Addr);
const MCAtom *findFirstAtomAfter(uint64_t Addr) const;
MCAtom *findFirstAtomAfter(uint64_t Addr);
typedef AtomListTy::const_iterator const_atom_iterator;
typedef AtomListTy:: iterator atom_iterator;

5
lib/MC/MCFunction.cpp
View File

@ -26,8 +26,9 @@ MCFunction::~MCFunction() {
}
MCBasicBlock &MCFunction::createBlock(const MCTextAtom &TA) {
Blocks.push_back(new MCBasicBlock(TA, this));
return *Blocks.back();
MCBasicBlock *MCBB = new MCBasicBlock(TA, this);
Blocks.push_back(MCBB);
return *MCBB;
}
const MCBasicBlock *MCFunction::find(uint64_t StartAddr) const {

20
lib/MC/MCModule.cpp
View File

@ -18,6 +18,10 @@ static bool AtomComp(const MCAtom *L, uint64_t Addr) {
return L->getEndAddr() < Addr;
}
static bool AtomCompInv(uint64_t Addr, const MCAtom *R) {
return Addr < R->getEndAddr();
}
void MCModule::map(MCAtom *NewAtom) {
uint64_t Begin = NewAtom->Begin;
@ -77,13 +81,23 @@ const MCAtom *MCModule::findAtomContaining(uint64_t Addr) const {
}
MCAtom *MCModule::findAtomContaining(uint64_t Addr) {
AtomListTy::iterator I = std::lower_bound(atom_begin(), atom_end(),
Addr, AtomComp);
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;
}
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();