6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-06 05:33:28 +00:00
Code Issues Projects Releases Wiki Activity

Remove use of asymmetric std::lower_bound comparator.

Browse Source 
VS 2008 doesn't like it when in debug mode.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@185676 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Ahmed Bougacha 2013-07-04 23:20:12 +00:00
parent 09bb56f0a0
commit 5679d7da01
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +51,11 @@ class MCModule {
/// \brief Insert an atom in the module, using its Begin and End addresses.
void map(MCAtom *NewAtom);
/// \brief Return an iterator to the first atom that is completely or in part
/// located after \p Addr, i.e., that \p Addr is bigger than its end address.
AtomListTy::const_iterator atom_lower_bound(uint64_t Addr) const;
AtomListTy:: iterator atom_lower_bound(uint64_t Addr);
/// @}
/// \name Function tracking

30
lib/MC/MCModule.cpp
View File

@ -14,8 +14,19 @@
using namespace llvm;
static bool AtomComp(const MCAtom *L, uint64_t Addr) {
return L->getEndAddr() < Addr;
static bool AtomComp(const MCAtom *LHS, const MCAtom *RHS) {
return LHS->getEndAddr() < RHS->getEndAddr();
}
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);
}
void MCModule::map(MCAtom *NewAtom) {
@ -24,8 +35,7 @@ void MCModule::map(MCAtom *NewAtom) {
assert(Begin <= NewAtom->End && "Creating MCAtom with endpoints reversed?");
// Check for atoms already covering this range.
AtomListTy::iterator I = std::lower_bound(atom_begin(), atom_end(),
Begin, AtomComp);
AtomListTy::iterator I = atom_lower_bound(Begin);
assert((I == atom_end() || (*I)->getBeginAddr() > NewAtom->End)
&& "Offset range already occupied!");
@ -48,15 +58,13 @@ 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 = std::lower_bound(atom_begin(), atom_end(),
Atom->Begin, AtomComp);
AtomListTy::iterator I = atom_lower_bound(Atom->Begin);
assert(I != atom_end() && "Atom offset not found in module!");
assert(*I == Atom && "Previous atom mapping was invalid!");
Atoms.erase(I);
// Insert the new mapping.
AtomListTy::iterator NewI = std::lower_bound(atom_begin(), atom_end(),
NewBegin, AtomComp);
AtomListTy::iterator NewI = atom_lower_bound(NewBegin);
Atoms.insert(NewI, Atom);
// Update the atom internal bounds.
@ -65,16 +73,14 @@ void MCModule::remap(MCAtom *Atom, uint64_t NewBegin, uint64_t NewEnd) {
}
const MCAtom *MCModule::findAtomContaining(uint64_t Addr) const {
AtomListTy::const_iterator I = std::lower_bound(atom_begin(), atom_end(),
Addr, AtomComp);
AtomListTy::const_iterator I = atom_lower_bound(Addr);
if (I != atom_end() && (*I)->getBeginAddr() <= Addr)
return *I;
return 0;
}
MCAtom *MCModule::findAtomContaining(uint64_t Addr) {
AtomListTy::iterator I = std::lower_bound(atom_begin(), atom_end(),
Addr, AtomComp);
AtomListTy::iterator I = atom_lower_bound(Addr);
if (I != atom_end() && (*I)->getBeginAddr() <= Addr)
return *I;
return 0;