77,78c77
< _name(_name), rangeCache(addrMap.end()), size(0),
< mmapUsingNoReserve(mmap_using_noreserve)
---
> _name(_name), size(0), mmapUsingNoReserve(mmap_using_noreserve)
239,252c238
< // 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();
296,304c282,284
< 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);
312,320c292,294
< 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);