mem: Tidy up CacheSet

Minor tweaks and house keeping.
This commit is contained in:
Andreas Hansson 2015-09-04 13:14:01 -04:00
parent 76088fb9ca
commit 2c50a83ba2

View file

@ -45,12 +45,11 @@
* Declaration of an associative set
*/
#ifndef __CACHESET_HH__
#define __CACHESET_HH__
#ifndef __MEM_CACHE_TAGS_CACHESET_HH__
#define __MEM_CACHE_TAGS_CACHESET_HH__
#include <cassert>
#include "mem/cache/blk.hh" // base class
/**
* An associative set of cache blocks.
@ -133,10 +132,7 @@ CacheSet<Blktype>::moveToHead(Blktype *blk)
do {
assert(i < assoc);
// swap blks[i] and next
Blktype *tmp = blks[i];
blks[i] = next;
next = tmp;
std::swap(blks[i], next);
++i;
} while (next != blk);
}
@ -158,10 +154,7 @@ CacheSet<Blktype>::moveToTail(Blktype *blk)
do {
assert(i >= 0);
// swap blks[i] and next
Blktype *tmp = blks[i];
blks[i] = next;
next = tmp;
std::swap(blks[i], next);
--i;
} while (next != blk);
}