6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-24 22:24:54 +00:00
Code Issues Projects Releases Wiki Activity

Changes to fix up the inst_iterator to pass to boost iterator checks. This

Browse Source 
patch was graciously contributed by Vladimir Prus.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@13185 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2004-04-27 15:13:33 +00:00
parent 21e232501a
commit 6ffe551f65
14 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/llvm/Support/InstIterator.h
View File

@@ -33,15 +33,18 @@ class InstIterator {
typedef _BB_i_t BBIty;
typedef _BI_t BIty;
typedef _II_t IIty;
_BB_t &BBs; // BasicBlocksType
_BB_t *BBs; // BasicBlocksType
_BB_i_t BB; // BasicBlocksType::iterator
_BI_t BI; // BasicBlock::iterator
public:
typedef std::bidirectional_iterator_tag iterator_category;
typedef IIty value_type;
typedef unsigned difference_type;
typedef BIty pointer;
typedef IIty reference;
typedef signed difference_type;
typedef IIty* pointer;
typedef IIty& reference;
// Default constructor
InstIterator() {}
// Copy constructor...
template<typename A, typename B, typename C, typename D>
@@ -53,26 +56,26 @@ public:
: BBs(II.BBs), BB(II.BB), BI(II.BI) {}
template<class M> InstIterator(M &m)
: BBs(m.getBasicBlockList()), BB(BBs.begin()) { // begin ctor
if (BB != BBs.end()) {
: BBs(&m.getBasicBlockList()), BB(BBs->begin()) { // begin ctor
if (BB != BBs->end()) {
BI = BB->begin();
advanceToNextBB();
}
}
template<class M> InstIterator(M &m, bool)
: BBs(m.getBasicBlockList()), BB(BBs.end()) { // end ctor
: BBs(&m.getBasicBlockList()), BB(BBs->end()) { // end ctor
}
// Accessors to get at the underlying iterators...
inline BBIty &getBasicBlockIterator() { return BB; }
inline BIty &getInstructionIterator() { return BI; }
inline IIty operator*() const { return BI; }
inline IIty operator->() const { return operator*(); }
inline reference operator*() const { return *BI; }
inline pointer operator->() const { return &operator*(); }
inline bool operator==(const InstIterator &y) const {
return BB == y.BB && (BB == BBs.end() || BI == y.BI);
return BB == y.BB && (BB == BBs->end() || BI == y.BI);
}
inline bool operator!=(const InstIterator& y) const {
return !operator==(y);
@@ -88,7 +91,7 @@ public:
}
InstIterator& operator--() {
while (BB == BBs.end() || BI == BB->begin()) {
while (BB == BBs->end() || BI == BB->begin()) {
--BB;
BI = BB->end();
}
@@ -99,7 +102,7 @@ public:
InstIterator tmp = *this; --*this; return tmp;
}
inline bool atEnd() const { return BB == BBs.end(); }
inline bool atEnd() const { return BB == BBs->end(); }
private:
inline void advanceToNextBB() {
@@ -107,7 +110,7 @@ private:
// the end() of the current BasicBlock and there are successor BBs.
while (BI == BB->end()) {
++BB;
if (BB == BBs.end()) break;
if (BB == BBs->end()) break;
BI = BB->begin();
}
}
@@ -116,11 +119,11 @@ private:
typedef InstIterator<iplist<BasicBlock>,
Function::iterator, BasicBlock::iterator,
Instruction*> inst_iterator;
Instruction> inst_iterator;
typedef InstIterator<const iplist<BasicBlock>,
Function::const_iterator,
BasicBlock::const_iterator,
const Instruction*> const_inst_iterator;
const Instruction> const_inst_iterator;
inline inst_iterator inst_begin(Function *F) { return inst_iterator(*F); }
inline inst_iterator inst_end(Function *F) { return inst_iterator(*F, true); }