gem5/src/base/range_map.hh
Koan-Sin Tan 7d4f187700 clang: Enable compiling gem5 using clang 2.9 and 3.0
This patch adds the necessary flags to the SConstruct and SConscript
files for compiling using clang 2.9 and later (on Ubuntu et al and OSX
XCode 4.2), and also cleans up a bunch of compiler warnings found by
clang. Most of the warnings are related to hidden virtual functions,
comparisons with unsigneds >= 0, and if-statements with empty
bodies. A number of mismatches between struct and class are also
fixed. clang 2.8 is not working as it has problems with class names
that occur in multiple namespaces (e.g. Statistics in
kernel_stats.hh).

clang has a bug (http://llvm.org/bugs/show_bug.cgi?id=7247) which
causes confusion between the container std::set and the function
Packet::set, and this is currently addressed by not including the
entire namespace std, but rather selecting e.g. "using std::vector" in
the appropriate places.
2012-01-31 12:05:52 -05:00

275 lines
5.9 KiB
C++

/*
* Copyright (c) 2006 The Regents of The University of Michigan
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met: redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer;
* redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution;
* neither the name of the copyright holders nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* Authors: Ali Saidi
*/
#ifndef __BASE_RANGE_MAP_HH__
#define __BASE_RANGE_MAP_HH__
#include <map>
#include "base/range.hh"
template <class T,class V>
class range_map
{
private:
typedef std::map<Range<T>,V> RangeMap;
RangeMap tree;
public:
typedef typename RangeMap::iterator iterator;
template <class U>
const iterator
find(const Range<U> &r)
{
iterator i;
i = tree.upper_bound(r);
if (i == tree.begin()) {
if (i->first.start <= r.end && i->first.end >= r.start)
return i;
else
// Nothing could match, so return end()
return tree.end();
}
i--;
if (i->first.start <= r.end && i->first.end >= r.start)
return i;
return tree.end();
}
template <class U>
const iterator
find(const U &r)
{
return find(RangeSize(r, 1));
}
template <class U>
bool
intersect(const Range<U> &r)
{
iterator i;
i = find(r);
if (i != tree.end())
return true;
return false;
}
template <class U,class W>
iterator
insert(const Range<U> &r, const W d)
{
if (intersect(r))
return tree.end();
return tree.insert(std::make_pair<Range<T>,V>(r, d)).first;
}
size_t
erase(T k)
{
return tree.erase(k);
}
void
erase(iterator p)
{
tree.erase(p);
}
void
erase(iterator p, iterator q)
{
tree.erase(p,q);
}
void
clear()
{
tree.erase(tree.begin(), tree.end());
}
iterator
begin()
{
return tree.begin();
}
iterator
end()
{
return tree.end();
}
size_t
size()
{
return tree.size();
}
bool
empty()
{
return tree.empty();
}
};
template <class T,class V>
class range_multimap
{
private:
typedef std::multimap<Range<T>,V> RangeMap;
RangeMap tree;
public:
typedef typename RangeMap::iterator iterator;
template <class U>
std::pair<iterator,iterator> find(const Range<U> &r)
{
iterator i;
iterator j;
i = tree.lower_bound(r);
if (i == tree.begin()) {
if (i->first.start <= r.end && i->first.end >= r.start)
return std::make_pair<iterator, iterator>(i,i);
else
// Nothing could match, so return end()
return std::make_pair<iterator, iterator>(tree.end(), tree.end());
}
i--;
if (i->first.start <= r.end && i->first.end >= r.start) {
// we have at least one match
j = i;
i--;
while (i->first.start <= r.end && i->first.end >=
r.start) {
if (i == tree.begin())
break;
i--;
}
if (i == tree.begin() && i->first.start <= r.end && i->first.end >=
r.start)
return std::make_pair<iterator, iterator>(i,j);
i++;
return std::make_pair<iterator, iterator>(i,j);
}
return std::make_pair<iterator, iterator>(tree.end(), tree.end());
}
template <class U>
bool
intersect(const Range<U> &r)
{
std::pair<iterator,iterator> p;
p = find(r);
if (p.first != tree.end())
return true;
return false;
}
template <class U,class W>
iterator
insert(const Range<U> &r, const W d)
{
std::pair<iterator,iterator> p;
p = find(r);
if ((p.first->first.start == r.start && p.first->first.end == r.end) ||
p.first == tree.end())
return tree.insert(std::make_pair<Range<T>,V>(r, d));
else
return tree.end();
}
size_t
erase(T k)
{
return tree.erase(k);
}
void
erase(iterator p)
{
tree.erase(p);
}
void
erase(iterator p, iterator q)
{
tree.erase(p,q);
}
void
clear()
{
tree.erase(tree.begin(), tree.end());
}
iterator
begin()
{
return tree.begin();
}
iterator
end()
{
return tree.end();
}
size_t
size()
{
return tree.size();
}
bool
empty()
{
return tree.empty();
}
};
#endif //__BASE_RANGE_MAP_HH__