diff options
| author | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-05-26 11:56:24 +0100 |
|---|---|---|
| committer | Nikos Nikoleris <nikos.nikoleris@arm.com> | 2016-05-26 11:56:24 +0100 |
| commit | d68f3577d6183de7dcadc1cfbfe53444e83989de (patch) | |
| tree | 4bacf524b307b385a74b237c0a2de0b0234908cc /src/mem/cache/tags/base_set_assoc.hh | |
| parent | 90bf50b4c7249a4f5529245a82bc59370de468bd (diff) | |
| download | gem5-d68f3577d6183de7dcadc1cfbfe53444e83989de.tar.xz | |
mem: change NULL to nullptr in the cache related classes
Change-Id: I5042410be54935650b7d05c84d8d9efbfcc06e70
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/mem/cache/tags/base_set_assoc.hh')
| -rw-r--r-- | src/mem/cache/tags/base_set_assoc.hh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mem/cache/tags/base_set_assoc.hh b/src/mem/cache/tags/base_set_assoc.hh index 910d44b36..053274c53 100644 --- a/src/mem/cache/tags/base_set_assoc.hh +++ b/src/mem/cache/tags/base_set_assoc.hh @@ -193,7 +193,7 @@ public: /** * Access block and update replacement data. May not succeed, in which case - * NULL pointer is returned. This has all the implications of a cache + * nullptr is returned. This has all the implications of a cache * access and should only be used as such. Returns the access latency as a * side effect. * @param addr The address to find. @@ -215,14 +215,14 @@ public: // a hit. Sequential access with a miss doesn't access data. tagAccesses += allocAssoc; if (sequentialAccess) { - if (blk != NULL) { + if (blk != nullptr) { dataAccesses += 1; } } else { dataAccesses += allocAssoc; } - if (blk != NULL) { + if (blk != nullptr) { if (blk->whenReady > curTick() && cache->ticksToCycles(blk->whenReady - curTick()) > accessLatency) { @@ -253,7 +253,7 @@ public: */ CacheBlk* findVictim(Addr addr) override { - BlkType *blk = NULL; + BlkType *blk = nullptr; int set = extractSet(addr); // prefer to evict an invalid block |