2c2
< * Copyright (c) 2012-2013 ARM Limited
---
> * Copyright (c) 2012-2014 ARM Limited
57c57
< :BaseTags(p), assoc(p->assoc),
---
> :BaseTags(p), assoc(p->assoc), allocAssoc(p->assoc),
110a111
> blk->way = j;
130a132,137
> CacheBlk*
> BaseSetAssoc::findBlockBySetAndWay(int set, int way) const
> {
> return sets[set].blks[way];
> }
>