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/cache.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/cache.hh')
| -rw-r--r-- | src/mem/cache/cache.hh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mem/cache/cache.hh b/src/mem/cache/cache.hh index d0bec127f..e1c99ea04 100644 --- a/src/mem/cache/cache.hh +++ b/src/mem/cache/cache.hh @@ -290,7 +290,7 @@ class Cache : public BaseCache * Find a block frame for new block at address addr targeting the * given security space, assuming that the block is not currently * in the cache. Append writebacks if any to provided packet - * list. Return free block frame. May return NULL if there are + * list. Return free block frame. May return nullptr if there are * no replaceable blocks at the moment. */ CacheBlk *allocateBlock(Addr addr, bool is_secure, PacketList &writebacks); @@ -464,10 +464,10 @@ class Cache : public BaseCache * given parameters. * @param cpu_pkt The miss that needs to be satisfied. * @param blk The block currently in the cache corresponding to - * cpu_pkt (NULL if none). + * cpu_pkt (nullptr if none). * @param needsWritable Indicates that the block must be writable * even if the request in cpu_pkt doesn't indicate that. - * @return A new Packet containing the request, or NULL if the + * @return A new Packet containing the request, or nullptr if the * current request in cpu_pkt should just be forwarded on. */ PacketPtr createMissPacket(PacketPtr cpu_pkt, CacheBlk *blk, |