From e04e976e22be76e13eacd45b33f71eb85cefd81e Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 7 Oct 2019 16:11:48 +0100 Subject: base: Add addIntlvBits to AddrRange This method performs the opposite operation of removeIntlvBits and can be used to transform a channel-local address to a global PA. Change-Id: I2fab587d7c094597e52422305775ac7f31efba34 Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21599 Reviewed-by: Nikos Nikoleris Reviewed-by: Daniel Carvalho Tested-by: kokoro --- src/base/addr_range.test.cc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/base/addr_range.test.cc') diff --git a/src/base/addr_range.test.cc b/src/base/addr_range.test.cc index 54eb1984c..93afbb0e7 100644 --- a/src/base/addr_range.test.cc +++ b/src/base/addr_range.test.cc @@ -121,6 +121,16 @@ class AddrRangeBase : public testing::Test { } } + void testAddRemoveIntlvBits() + { + for (Addr addr = start; addr <= end; addr++) { + AddrRange &r = range[getIndex(addr)]; + Addr ch_addr = r.removeIntlvBits(addr); + Addr pa = r.addIntlvBits(ch_addr); + ASSERT_EQ(addr, pa); + } + } + static const Addr end = 0x1ffff; static const Addr start = 0x0; static const int intlvSize = 4; @@ -162,6 +172,11 @@ TEST_F(AddrRangeCont, AddrRangeGetOffset) testGetOffset(); } +TEST_F(AddrRangeCont, AddrRangeAddRemoveIntlvBits) +{ + testAddRemoveIntlvBits(); +} + class AddrRangeContLegacy : public AddrRangeCont { protected: @@ -185,6 +200,10 @@ TEST_F(AddrRangeContLegacy, AddrRangeGetOffset) testGetOffset(); } +TEST_F(AddrRangeContLegacy, AddrRangeAddRemoveIntlvBits) +{ + testAddRemoveIntlvBits(); +} class AddrRangeArb : public AddrRangeBase { protected: @@ -218,3 +237,8 @@ TEST_F(AddrRangeArb, AddrRangeGetOffset) { testGetOffset(); } + +TEST_F(AddrRangeArb, AddrRangeAddRemoveIntlvBits) +{ + testAddRemoveIntlvBits(); +} -- cgit v1.2.3