diff options
author | Andreas Hansson <andreas.hansson@arm.com> | 2013-01-07 13:05:38 -0500 |
---|---|---|
committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-01-07 13:05:38 -0500 |
commit | 71da1d21578b6f9cf5b43bd4648f313326849533 (patch) | |
tree | 639972c7c05b28380952bc655b4dd170d888599d /src/mem/bus.hh | |
parent | cfdaf53104625a04d504972c76545bf869c6a476 (diff) | |
download | gem5-71da1d21578b6f9cf5b43bd4648f313326849533.tar.xz |
base: Encapsulate the underlying fields in AddrRange
This patch makes the start and end address private in a move to
prevent direct manipulation and matching of ranges based on these
fields. This is done so that a transition to ranges with interleaving
support is possible.
As a result of hiding the start and end, a number of member functions
are needed to perform the comparisons and manipulations that
previously took place directly on the members. An accessor function is
provided for the start address, and a function is added to test if an
address is within a range. As a result of the latter the != and ==
operator is also removed in favour of the member function. A member
function that returns a string representation is also created to allow
debug printing.
In general, this patch does not add any functionality, but it does
take us closer to a situation where interleaving (and more cleverness)
can be added under the bonnet without exposing it to the user. More on
that in a later patch.
Diffstat (limited to 'src/mem/bus.hh')
-rw-r--r-- | src/mem/bus.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/bus.hh b/src/mem/bus.hh index 19ffa020c..59dabbfe4 100644 --- a/src/mem/bus.hh +++ b/src/mem/bus.hh @@ -264,13 +264,13 @@ class BaseBus : public MemObject // Checks the cache and returns the id of the port that has the requested // address within its range inline PortID checkPortCache(Addr addr) const { - if (portCache[0].valid && portCache[0].range == addr) { + if (portCache[0].valid && portCache[0].range.contains(addr)) { return portCache[0].id; } - if (portCache[1].valid && portCache[1].range == addr) { + if (portCache[1].valid && portCache[1].range.contains(addr)) { return portCache[1].id; } - if (portCache[2].valid && portCache[2].range == addr) { + if (portCache[2].valid && portCache[2].range.contains(addr)) { return portCache[2].id; } |