diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2012-09-19 06:15:44 -0400 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2012-09-19 06:15:44 -0400 |
commit | ffb6aec603c38e16ae91ea975c16fc3e8fb337e5 (patch) | |
tree | fdf6e12bea9788f46589a9bcb15a8fe67581786f /src/mem/physical.hh | |
parent | c34df76272c17401955f6daf30ca9c7e7671ae56 (diff) | |
download | gem5-ffb6aec603c38e16ae91ea975c16fc3e8fb337e5.tar.xz |
AddrRange: Transition from Range<T> to AddrRange
This patch takes the final plunge and transitions from the templated
Range class to the more specific AddrRange. In doing so it changes the
obvious Range<Addr> to AddrRange, and also bumps the range_map to be
AddrRangeMap.
In addition to the obvious changes, including the removal of redundant
includes, this patch also does some house keeping in preparing for the
introduction of address interleaving support in the ranges. The Range
class is also stripped of all the functionality that is never used.
--HG--
rename : src/base/range.hh => src/base/addr_range.hh
rename : src/base/range_map.hh => src/base/addr_range_map.hh
Diffstat (limited to 'src/mem/physical.hh')
-rw-r--r-- | src/mem/physical.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/physical.hh b/src/mem/physical.hh index e78b1d2da..fb9969a34 100644 --- a/src/mem/physical.hh +++ b/src/mem/physical.hh @@ -40,7 +40,7 @@ #ifndef __PHYSICAL_MEMORY_HH__ #define __PHYSICAL_MEMORY_HH__ -#include "base/range_map.hh" +#include "base/addr_range_map.hh" #include "mem/abstract_mem.hh" #include "mem/packet.hh" @@ -55,10 +55,10 @@ class PhysicalMemory private: // Global address map - range_map<Addr, AbstractMemory* > addrMap; + AddrRangeMap<AbstractMemory*> addrMap; // a mutable cache for the last range that matched an address - mutable Range<Addr> rangeCache; + mutable AddrRange rangeCache; // All address-mapped memories std::vector<AbstractMemory*> memories; |