From de285ff2a0c49fdf61dba7c4fcc6b3804e045e56 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Sat, 7 Feb 2004 01:16:50 -0500 Subject: Totally rework the Range class. Now the range is from [start, end) to be consistent with the way that the stl works. It also makes lots of other stuff easier. (Maybe those guys were smart?) Overload the various comparison operators so that you can test for overlapping of ranges, etc. base/range.hh: Totally rework the Range class. Now the range is from [start, end) to be consistent with the way that the stl works. It also makes lots of other stuff easier. (Maybe those guys were smart?) Overload the various comparison operators so that you can test for overlapping of ranges, etc. make parse function private and offer operator= instead isValid -> valid and for you erik, I add comments test/Makefile: add range.o test/rangetest.cc: better tests --HG-- extra : convert_revision : dd58720aa3d02f20b03e933f2eaa3320c82bb27a --- base/range.cc | 83 ++++++++++++ base/range.hh | 418 ++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 346 insertions(+), 155 deletions(-) create mode 100644 base/range.cc (limited to 'base') diff --git a/base/range.cc b/base/range.cc new file mode 100644 index 000000000..0a4876e89 --- /dev/null +++ b/base/range.cc @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2003 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. + */ + +#include "base/intmath.hh" +#include "base/range.hh" +#include "base/str.hh" + +using namespace std; + +template +bool +__x_parse_range(const std::string &str, T &start, T &end) +{ + std::vector values; + tokenize(values, str, ':'); + + T thestart, theend; + + if (values.size() != 2) + return false; + + std::string s = values[0]; + std::string e = values[1]; + + if (!to_number(s, thestart)) + return false; + + bool increment = (e[0] == '+'); + if (increment) + e = e.substr(1); + + if (!to_number(e, theend)) + return false; + + if (increment) + theend += thestart; + + start = thestart; + end = theend; + + return true; +} + +#define RANGE_PARSE(type) \ +template<> bool \ +__parse_range(const std::string &s, type &start, type &end) \ +{ return __x_parse_range(s, start, end); } + +RANGE_PARSE(unsigned long long); +RANGE_PARSE(signed long long); +RANGE_PARSE(unsigned long); +RANGE_PARSE(signed long); +RANGE_PARSE(unsigned int); +RANGE_PARSE(signed int); +RANGE_PARSE(unsigned short); +RANGE_PARSE(signed short); +RANGE_PARSE(unsigned char); +RANGE_PARSE(signed char); diff --git a/base/range.hh b/base/range.hh index 3443bf246..34bd34136 100644 --- a/base/range.hh +++ b/base/range.hh @@ -29,232 +29,340 @@ #ifndef __RANGE_HH__ #define __RANGE_HH__ -#include +#include +#include -#include "base/intmath.hh" -#include "base/str.hh" +template +bool __parse_range(const std::string &s, T &start, T &end); -template -class Range +template +struct Range { private: - bool valid; + /** + * @param s range string + * Ranges are in the following format: + * := {}:{} + * := | + + */ + void + parse(const std::string &s) + { + if (!__parse_range(s, start, end)) + invalidate(); + } public: T start; T end; public: - Range() {} + Range() + { + invalidate(); + } + + template + Range(const Range &r) + : start(r.start), end(r.end) + {} - Range(const Range &r) { operator=(r); } + template + Range(const std::pair &r) + : start(r.first), end(r.second) + {} - Range(const T &s, const T &e) - : start(s), end(e) + Range(const std::string &s) { - valid = (start <= end); + parse(s); } - Range(const std::string &s) { valid = parse(s); } + template + const Range &operator=(const Range &r) + { + start = r.start; + end = r.end; + return *this; + } - ~Range() {} + template + const Range &operator=(const std::pair &r) + { + start = r.first; + end = r.second; + return *this; + } - int compare(const T &p); - bool parse(const std::string &s); - const Range &operator=(const Range &r); + const Range &operator=(const std::string &s) + { + parse(s); + return *this; + } - bool isValid() const { return valid; } + void invalidate() { start = 0; end = 0; } + bool size() const { return end - start; } + bool valid() const { return start < end; } }; - template -inline int -Range::compare(const T &p) +inline std::ostream & +operator<<(std::ostream &o, const Range &r) { - assert(isValid()); - - if (p < start) - return -1; - else if (p > end) - return 1; - else - return 0; + // don't currently support output of invalid ranges + assert(r.valid()); + o << r.start << ":" << r.end; + return o; } -// Parse a range string +//////////////////////////////////////////////////////////////////////// // -// Ranges are in the following format: -// := {}:{} -// := | + -template +// Range to Range Comparisons +// + +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 and range2 are identical. + */ +template inline bool -Range::parse(const std::string &str) +operator==(const Range &range1, const Range &range2) { - std::vector values; - tokenize(values, str, ':'); - - T thestart, theend; - - if (values.size() != 2) - return false; - - std::string s = values[0]; - std::string e = values[1]; - - if (!to_number(s, thestart)) - return false; - - bool increment = (e[0] == '+'); - if (increment) - e = e.substr(1); - - if (!to_number(e, theend)) - return false; - - if (increment) - theend += thestart; - - start = thestart; - end = theend; - - if (start > end) - return false; - - return true; + assert(range1.valid() && range2.valid()); + return range1.start == range2.start && range1.end == range2.end; } - -template -inline const Range & -Range::operator=(const Range &r) +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 and range2 are not identical. + */ +template +inline bool +operator!=(const Range &range1, const Range &range2) { - if (this != &r) { - start = r.start; - end = r.end; - - valid = r.valid; - } - else { - valid = false; - } + assert(range1.valid() && range2.valid()); + return range1.start != range2.start || range1.end != range2.end; +} - return *this; +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is less than range2 and does not overlap range1. + */ +template +inline bool +operator<(const Range &range1, const Range &range2) +{ + assert(range1.valid() && range2.valid()); + return range1.end <= range2.start; } -template -inline std::ostream & -operator<<(std::ostream &o, const Range &r) +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is less than range2. range1 may overlap range2, + * but not extend beyond the end of range2. + */ +template +inline bool +operator<=(const Range &range1, const Range &range2) { - // don't currently support output of invalid ranges - assert(r.isValid()); - o << r.start << ":" << r.end; - return o; + assert(range1.valid() && range2.valid()); + return range1.start <= range2.start && range1.end <= range2.end; } -////////////////////////////////////////// -// -// Compare two ranges -// -template +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is greater than range2 and does not overlap range2. + */ +template inline bool -operator==(const Range &l, const Range &r) +operator>(const Range &range1, const Range &range2) { - // ranges must both be valid to be equal - return (l.isValid() && r.isValid() && - (l.start == r.start) && (l.end == r.end)); + assert(range1.valid() && range2.valid()); + return range1.start >= range2.end; } -template +/** + * @param range1 is a range. + * @param range2 is a range. + * @return if range1 is greater than range2. range1 may overlap range2, + * but not extend beyond the beginning of range2. + */ +template inline bool -operator!=(const Range &l, const Range &r) +operator>=(const Range &range1, const Range &range2) { - // for symmetry with ==, an invalid range is not equal to any other - return (!l.isValid() || !r.isValid() || - (l.start != r.start) || (l.end != r.end)); + assert(range1.valid() && range2.valid()); + return range1.start >= range2.start && range1.end >= range2.end; } -////////////////////////////////////////// -// -// Compare position to a range -// -// - 'pos == range' indicates that position pos is within the given range. -// This test always returns false if the range is invalid. -// -// - 'pos < range' and 'pos > range' indicate that the position is -// before the start of or after the end of the range, respectively. -// The range must be valid for these comparisons to be made. -// -// All other comparisons do the obvious thing based on these definitions. +//////////////////////////////////////////////////////////////////////// // +// Position to Range Comparisons // -// -// Basic comparisons -// -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is within the range. + */ +template inline bool -operator==(const T &pos, const Range &range) -{ return range.isValid() && pos >= range.start && pos <= range.end; } +operator==(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.start && pos < range.end; +} -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is not within the range. + */ +template inline bool -operator<(const T &pos, const Range &range) -{ assert(range.isValid()); return pos < range.start; } +operator!=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.start || pos >= range.end; +} -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is below the range. + */ +template inline bool -operator>(const T &pos, const Range &range) -{ assert(range.isValid()); return pos > range.end; } +operator<(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.start; +} -// -// Derived comparisons -// -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is below or in the range. + */ +template inline bool -operator<=(const T &pos, const Range &range) -{ assert(range.isValid()); return pos <= range.end; } +operator<=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos < range.end; +} -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is above the range. + */ +template inline bool -operator>=(const T &pos, const Range &range) -{ assert(range.isValid()); return pos >= range.start; } +operator>(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.end; +} -template +/** + * @param pos position compared to the range. + * @param range range compared against. + * @return indicates that position pos is above or in the range. + */ +template inline bool -operator!=(const T &pos, const Range &range) -{ return !(pos == range); } +operator>=(const T &pos, const Range &range) +{ + assert(range.valid()); + return pos >= range.start; +} +//////////////////////////////////////////////////////////////////////// // -// Define symmetric comparisons based on above +// Range to Position Comparisons (for symmetry) // -template + +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is within the range. + */ +template inline bool -operator>(const Range &range, const T &pos) -{ return pos < range; } +operator==(const Range &range, const U &pos) +{ + assert(range.valid()); + return pos >= range.start && pos < range.end; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is not within the range. + */ +template inline bool -operator<(const Range &range, const T &pos) -{ return pos > range; } +operator!=(const Range &range, const U &pos) +{ + assert(range.valid()); + return pos < range.start || pos >= range.end; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is above the range. + */ +template inline bool -operator<=(const Range &range, const T &pos) -{ return pos >= range; } +operator<(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.end <= pos; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * @return indicates that position pos is above or in the range. + */ +template inline bool -operator>=(const Range &range, const T &pos) -{ return pos <= range; } +operator<=(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.start <= pos; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * 'range > pos' indicates that position pos is below the range. + */ +template inline bool -operator==(const Range &range, const T &pos) -{ return (pos == range); } +operator>(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.start > pos; +} -template +/** + * @param range range compared against. + * @param pos position compared to the range. + * 'range >= pos' indicates that position pos is below or in the range. + */ +template inline bool -operator!=(const Range &range, const T &pos) -{ return (pos != range); } +operator>=(const Range &range, const U &pos) +{ + assert(range.valid()); + return range.end > pos; +} #endif // __RANGE_HH__ -- cgit v1.2.3 From 9c7bec74b1deb9fd78d17818e0bc14620d2b4314 Mon Sep 17 00:00:00 2001 From: Erik Hallnor Date: Sun, 8 Feb 2004 17:26:27 -0500 Subject: Separate template definitions and instantiations into *_impl.hh and *.cc. Eventually the *.cc fils should be generate by our super-duper python script. base/compression/null_compression.hh: Need some includes. --HG-- extra : convert_revision : caf52320f6f6ff255e8a93817419ad13ad44224f --- base/compression/null_compression.hh | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'base') diff --git a/base/compression/null_compression.hh b/base/compression/null_compression.hh index d2bc76eef..6a630b113 100644 --- a/base/compression/null_compression.hh +++ b/base/compression/null_compression.hh @@ -34,6 +34,10 @@ * This file defines a doNothing compression algorithm. */ +#include // for uint8_t +#include "base/misc.hh" // for fatal() + + /** * A dummy compression class to use when no data compression is desired. */ -- cgit v1.2.3 From 6ece3a7e5985e4bf5ff1f8eb9d0680647d00c4c6 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 9 Feb 2004 09:04:52 -0500 Subject: random fixes base/range.hh: Add a constructor that takes the beginning and end as arguments size returns T not a bool quick make_range() function that is a shortcut for making a range kinda like make_pair() quick formatting fix --HG-- extra : convert_revision : 94b1d462710e6fb55e72e1da2ad8c46993af1ef7 --- base/range.hh | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) (limited to 'base') diff --git a/base/range.hh b/base/range.hh index 34bd34136..d72aa9755 100644 --- a/base/range.hh +++ b/base/range.hh @@ -62,6 +62,10 @@ struct Range invalidate(); } + Range(T first, T second) + : start(first), end(second) + {} + template Range(const Range &r) : start(r.start), end(r.end) @@ -100,11 +104,18 @@ struct Range } void invalidate() { start = 0; end = 0; } - bool size() const { return end - start; } + T size() const { return end - start; } bool valid() const { return start < end; } }; -template +template +inline Range +make_range(T start, T end) +{ + return Range(start, end); +} + +template inline std::ostream & operator<<(std::ostream &o, const Range &r) { @@ -124,7 +135,7 @@ operator<<(std::ostream &o, const Range &r) * @param range2 is a range. * @return if range1 and range2 are identical. */ -template +template inline bool operator==(const Range &range1, const Range &range2) { @@ -137,7 +148,7 @@ operator==(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 and range2 are not identical. */ -template +template inline bool operator!=(const Range &range1, const Range &range2) { @@ -150,7 +161,7 @@ operator!=(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 is less than range2 and does not overlap range1. */ -template +template inline bool operator<(const Range &range1, const Range &range2) { @@ -164,7 +175,7 @@ operator<(const Range &range1, const Range &range2) * @return if range1 is less than range2. range1 may overlap range2, * but not extend beyond the end of range2. */ -template +template inline bool operator<=(const Range &range1, const Range &range2) { @@ -177,7 +188,7 @@ operator<=(const Range &range1, const Range &range2) * @param range2 is a range. * @return if range1 is greater than range2 and does not overlap range2. */ -template +template inline bool operator>(const Range &range1, const Range &range2) { @@ -191,7 +202,7 @@ operator>(const Range &range1, const Range &range2) * @return if range1 is greater than range2. range1 may overlap range2, * but not extend beyond the beginning of range2. */ -template +template inline bool operator>=(const Range &range1, const Range &range2) { @@ -209,7 +220,7 @@ operator>=(const Range &range1, const Range &range2) * @param range range compared against. * @return indicates that position pos is within the range. */ -template +template inline bool operator==(const T &pos, const Range &range) { @@ -222,7 +233,7 @@ operator==(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is not within the range. */ -template +template inline bool operator!=(const T &pos, const Range &range) { @@ -235,7 +246,7 @@ operator!=(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is below the range. */ -template +template inline bool operator<(const T &pos, const Range &range) { @@ -248,7 +259,7 @@ operator<(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is below or in the range. */ -template +template inline bool operator<=(const T &pos, const Range &range) { @@ -261,7 +272,7 @@ operator<=(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is above the range. */ -template +template inline bool operator>(const T &pos, const Range &range) { @@ -274,7 +285,7 @@ operator>(const T &pos, const Range &range) * @param range range compared against. * @return indicates that position pos is above or in the range. */ -template +template inline bool operator>=(const T &pos, const Range &range) { @@ -292,7 +303,7 @@ operator>=(const T &pos, const Range &range) * @param pos position compared to the range. * @return indicates that position pos is within the range. */ -template +template inline bool operator==(const Range &range, const U &pos) { @@ -305,7 +316,7 @@ operator==(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is not within the range. */ -template +template inline bool operator!=(const Range &range, const U &pos) { @@ -318,7 +329,7 @@ operator!=(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is above the range. */ -template +template inline bool operator<(const Range &range, const U &pos) { @@ -331,7 +342,7 @@ operator<(const Range &range, const U &pos) * @param pos position compared to the range. * @return indicates that position pos is above or in the range. */ -template +template inline bool operator<=(const Range &range, const U &pos) { @@ -344,7 +355,7 @@ operator<=(const Range &range, const U &pos) * @param pos position compared to the range. * 'range > pos' indicates that position pos is below the range. */ -template +template inline bool operator>(const Range &range, const U &pos) { @@ -357,7 +368,7 @@ operator>(const Range &range, const U &pos) * @param pos position compared to the range. * 'range >= pos' indicates that position pos is below or in the range. */ -template +template inline bool operator>=(const Range &range, const U &pos) { -- cgit v1.2.3 From da8a7022126eef87d4007b7135aa89c559eb6747 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 9 Feb 2004 10:49:48 -0500 Subject: - Whack unused code - Make the MemoryController use address ranges (via Range) instead of an address and a mask base/remote_gdb.cc: reflect name change dev/alpha_access.h: better include dev/alpha_console.cc: - FunctionalMemory no longer takes care of mapping my address into the proper address space. It must be done locally. - the memory controller no longer uses a mask, but a size, and the size is determined by the device, not the .ini file - fix up address calculations to reflect the removal of a mask - PhysicalMemory::getSize() -> PhysicalMemory::size() dev/alpha_console.hh: - FunctionalMemory no longer takes care of mapping my address into the proper address space. It must be done locally. - the memory controller no longer uses a mask, but a size, and the size is determined by the device, not the .ini file - fix up address calculations to reflect the removal of a mask - get rid of MmapDevice and inherit from FunctionalMemory --HG-- extra : convert_revision : e3a65c9debf6f899632d62c70781cbdc2826616b --- base/remote_gdb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc index e701b5a01..e20800d12 100644 --- a/base/remote_gdb.cc +++ b/base/remote_gdb.cc @@ -338,7 +338,7 @@ RemoteGDB::acc(Addr va, size_t len) } if (va < ALPHA_K1SEG_BASE) { - if (va < (ALPHA_K0SEG_BASE + pmem->getSize())) { + if (va < (ALPHA_K0SEG_BASE + pmem->size())) { DPRINTF(GDBAcc, "acc: Mapping is valid K0SEG <= " "%#x < K0SEG + size\n", va); return true; -- cgit v1.2.3