sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

base: Allow multiple interleaved ranges

Browse source 
This patch changes how the address range calculates intersection such
that a system can have a number of non-overlapping interleaved ranges
without complaining. Without this patch we end up with a panic.
This commit is contained in:
Andreas Hansson 2015-05-26 03:21:40 -04:00
parent 4bc7dfb697
commit 53a360985b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/base/addr_range.hh
View file

@ -282,26 +282,26 @@ class AddrRange
*/
bool intersects(const AddrRange& r) const
{
if (!interleaved()) {
return _start <= r._end && _end >= r._start;
}
if (_start > r._end || _end < r._start)
// start with the simple case of no overlap at all,
// applicable even if we have interleaved ranges
return false;
else if (!interleaved() && !r.interleaved())
// if neither range is interleaved, we are done
return true;
// the current range is interleaved, split the check up in
// three cases
// now it gets complicated, focus on the cases we care about
if (r.size() == 1)
// keep it simple and check if the address is within
// this range
return contains(r.start());
else if (!r.interleaved())
// be conservative and ignore the interleaving
return _start <= r._end && _end >= r._start;
else if (mergesWith(r))
// restrict the check to ranges that belong to the
// same chunk
return intlvMatch == r.intlvMatch;
else
panic("Cannot test intersection of interleaved range %s\n",
to_string());
panic("Cannot test intersection of %s and %s\n",
to_string(), r.to_string());
}
/**