121c121
< AddrRangeMap<AbstractMemory*> addrMap;
---
> AddrRangeMap<AbstractMemory*, 1> addrMap;
123,126d122
< // a mutable cache for the last address map iterator that matched
< // an address
< mutable AddrRangeMap<AbstractMemory*>::const_iterator rangeCache;
<