diff options
Diffstat (limited to 'src/base/addr_range.hh')
| -rw-r--r-- | src/base/addr_range.hh | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/base/addr_range.hh b/src/base/addr_range.hh index b243d68aa..842f01ad9 100644 --- a/src/base/addr_range.hh +++ b/src/base/addr_range.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2014, 2017 ARM Limited + * Copyright (c) 2012, 2014, 2017-2018 ARM Limited * All rights reserved * * The license below extends only to copyright in the software and shall @@ -45,6 +45,7 @@ #ifndef __BASE_ADDR_RANGE_HH__ #define __BASE_ADDR_RANGE_HH__ +#include <algorithm> #include <list> #include <vector> @@ -195,7 +196,17 @@ class AddrRange */ uint64_t granularity() const { - return ULL(1) << (intlvHighBit - intlvBits + 1); + if (interleaved()) { + const uint8_t intlv_low_bit = intlvHighBit - intlvBits + 1; + if (hashed()) { + const uint8_t xor_low_bit = xorHighBit - intlvBits + 1; + return ULL(1) << std::min(intlv_low_bit, xor_low_bit); + } else { + return ULL(1) << intlv_low_bit; + } + } else { + return size(); + } } /** @@ -316,7 +327,17 @@ class AddrRange { if (interleaved()) panic("Cannot test subset of interleaved range %s\n", to_string()); - return _start >= r._start && _end <= r._end; + + // This address range is not interleaved and therefore it + // suffices to check the upper bound, the lower bound and + // whether it would fit in a continuous segment of the input + // addr range. + if (r.interleaved()) { + return r.contains(_start) && r.contains(_end) && + size() <= r.granularity(); + } else { + return _start >= r._start && _end <= r._end; + } } /** |