2c2
< * Copyright (c) 2012-2013 ARM Limited
---
> * Copyright (c) 2012-2014 ARM Limited
89a90,91
> /** The allocatable associativity of the cache (alloc mask). */
> unsigned allocAssoc;
148a151,178
> * Return the number of sets this cache has
> * @return The number of sets.
> */
> unsigned
> getNumSets() const
> {
> return numSets;
> }
>
> /**
> * Return the number of ways this cache has
> * @return The number of ways.
> */
> unsigned
> getNumWays() const
> {
> return assoc;
> }
>
> /**
> * Find the cache block given set and way
> * @param set The set of the block.
> * @param way The way of the block.
> * @return The cache block.
> */
> CacheBlk *findBlockBySetAndWay(int set, int way) const;
>
> /**
186c216
< tagAccesses += assoc;
---
> tagAccesses += allocAssoc;
192c222
< dataAccesses += assoc;
---
> dataAccesses += allocAssoc;
230c260
< for (int i = 0; i < assoc; ++i) {
---
> for (int i = 0; i < allocAssoc; ++i) {
232c262
< if (!blk->isValid()) {
---
> if (!blk->isValid())
234d263
< }
294a324,342
> * Limit the allocation for the cache ways.
> * @param ways The maximum number of ways available for replacement.
> */
> virtual void setWayAllocationMax(int ways)
> {
> fatal_if(ways < 1, "Allocation limit must be greater than zero");
> allocAssoc = ways;
> }
>
> /**
> * Get the way allocation mask limit.
> * @return The maximum number of ways available for replacement.
> */
> virtual int getWayAllocationMax() const
> {
> return allocAssoc;
> }
>
> /**