summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mem/physical.cc42
-rw-r--r--src/mem/physical.hh6
2 files changed, 9 insertions, 39 deletions
diff --git a/src/mem/physical.cc b/src/mem/physical.cc
index c7dbb3bcb..fdc88a8c0 100644
--- a/src/mem/physical.cc
+++ b/src/mem/physical.cc
@@ -74,8 +74,7 @@ using namespace std;
PhysicalMemory::PhysicalMemory(const string& _name,
const vector<AbstractMemory*>& _memories,
bool mmap_using_noreserve) :
- _name(_name), rangeCache(addrMap.end()), size(0),
- mmapUsingNoReserve(mmap_using_noreserve)
+ _name(_name), size(0), mmapUsingNoReserve(mmap_using_noreserve)
{
if (mmap_using_noreserve)
warn("Not reserving swap space. May cause SIGSEGV on actual usage\n");
@@ -236,20 +235,7 @@ PhysicalMemory::~PhysicalMemory()
bool
PhysicalMemory::isMemAddr(Addr addr) const
{
- // see if the address is within the last matched range
- if (rangeCache != addrMap.end() && rangeCache->first.contains(addr)) {
- return true;
- } else {
- // lookup in the interval tree
- const auto& r = addrMap.contains(addr);
- if (r == addrMap.end()) {
- // not in the cache, and not in the tree
- return false;
- }
- // the range is in the tree, update the cache
- rangeCache = r;
- return true;
- }
+ return addrMap.contains(addr) != addrMap.end();
}
AddrRangeList
@@ -293,15 +279,9 @@ PhysicalMemory::access(PacketPtr pkt)
{
assert(pkt->isRequest());
Addr addr = pkt->getAddr();
- if (rangeCache != addrMap.end() && rangeCache->first.contains(addr)) {
- rangeCache->second->access(pkt);
- } else {
- // do not update the cache here, as we typically call
- // isMemAddr before calling access
- const auto& m = addrMap.contains(addr);
- assert(m != addrMap.end());
- m->second->access(pkt);
- }
+ const auto& m = addrMap.contains(addr);
+ assert(m != addrMap.end());
+ m->second->access(pkt);
}
void
@@ -309,15 +289,9 @@ PhysicalMemory::functionalAccess(PacketPtr pkt)
{
assert(pkt->isRequest());
Addr addr = pkt->getAddr();
- if (rangeCache != addrMap.end() && rangeCache->first.contains(addr)) {
- rangeCache->second->functionalAccess(pkt);
- } else {
- // do not update the cache here, as we typically call
- // isMemAddr before calling functionalAccess
- const auto& m = addrMap.contains(addr);
- assert(m != addrMap.end());
- m->second->functionalAccess(pkt);
- }
+ const auto& m = addrMap.contains(addr);
+ assert(m != addrMap.end());
+ m->second->functionalAccess(pkt);
}
void
diff --git a/src/mem/physical.hh b/src/mem/physical.hh
index cc733b2d6..3fb3510b8 100644
--- a/src/mem/physical.hh
+++ b/src/mem/physical.hh
@@ -118,11 +118,7 @@ class PhysicalMemory : public Serializable
std::string _name;
// Global address map
- AddrRangeMap<AbstractMemory*> addrMap;
-
- // a mutable cache for the last address map iterator that matched
- // an address
- mutable AddrRangeMap<AbstractMemory*>::const_iterator rangeCache;
+ AddrRangeMap<AbstractMemory*, 1> addrMap;
// All address-mapped memories
std::vector<AbstractMemory*> memories;