diff options
| -rw-r--r-- | src/base/addr_range.hh | 2 | ||||
| -rw-r--r-- | src/base/addr_range.test.cc | 26 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/base/addr_range.hh b/src/base/addr_range.hh index 2a18551b2..f53c08b63 100644 --- a/src/base/addr_range.hh +++ b/src/base/addr_range.hh @@ -390,7 +390,7 @@ class AddrRange // whether it would fit in a continuous segment of the input // addr range. if (r.interleaved()) { - return r.contains(_start) && r.contains(_end) && + return r.contains(_start) && r.contains(_end - 1) && size() <= r.granularity(); } else { return _start >= r._start && _end <= r._end; diff --git a/src/base/addr_range.test.cc b/src/base/addr_range.test.cc index 4ab4ae402..890fb4f3a 100644 --- a/src/base/addr_range.test.cc +++ b/src/base/addr_range.test.cc @@ -261,6 +261,30 @@ TEST(AddrRangeTest, isSubsetPartialSubset) EXPECT_FALSE(r2.isSubset(r1)); } +TEST(AddrRangeTest, isSubsetInterleavedCompleteOverlap) +{ + AddrRange r1(0x00, 0x100, {0x40}, 0); + AddrRange r2(0x00, 0x40); + + EXPECT_TRUE(r2.isSubset(r1)); +} + +TEST(AddrRangeTest, isSubsetInterleavedNoOverlap) +{ + AddrRange r1(0x00, 0x100, {0x40}, 1); + AddrRange r2(0x00, 0x40); + + EXPECT_FALSE(r2.isSubset(r1)); +} + +TEST(AddrRangeTest, isSubsetInterleavedPartialOverlap) +{ + AddrRange r1(0x00, 0x100, {0x40}, 0); + AddrRange r2(0x10, 0x50); + + EXPECT_FALSE(r2.isSubset(r1)); +} + TEST(AddrRangeTest, Contains) { AddrRange r(0xF0, 0xF5); @@ -1038,4 +1062,4 @@ TEST(AddrRangeTest, RangeSizeConstruction){ AddrRange r = RangeSize(0x5, 5); EXPECT_EQ(0x5, r.start()); EXPECT_EQ(0xA, r.end()); -}
\ No newline at end of file +} |