diff options
| author | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
|---|---|---|
| committer | Andreas Hansson <andreas.hansson@arm.com> | 2013-02-19 05:56:06 -0500 |
| commit | c10098f28be209e90277925e3f983b7e62d1d037 (patch) | |
| tree | 0b9c9f562c030ae74ae0a5fea25f804fdb84cec0 /src/mem/cache | |
| parent | 860155a5fc48f983e9af40c19bf8db8250709c26 (diff) | |
| download | gem5-c10098f28be209e90277925e3f983b7e62d1d037.tar.xz | |
scons: Fix up numerous warnings about name shadowing
This patch address the most important name shadowing warnings (as
produced when using gcc/clang with -Wshadow). There are many
locations where constructor parameters and function parameters shadow
local variables, but these are left unchanged.
Diffstat (limited to 'src/mem/cache')
| -rw-r--r-- | src/mem/cache/cache_impl.hh | 6 | ||||
| -rw-r--r-- | src/mem/cache/tags/fa_lru.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index b30132748..8f7938b93 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -319,8 +319,8 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk, incMissCount(pkt); return false; } - int id = pkt->req->masterId(); - tags->insertBlock(pkt->getAddr(), blk, id); + int master_id = pkt->req->masterId(); + tags->insertBlock(pkt->getAddr(), blk, master_id); blk->status = BlkValid | BlkReadable; } std::memcpy(blk->data, pkt->getPtr<uint8_t>(), blkSize); @@ -1005,7 +1005,7 @@ Cache<TagStore>::recvTimingResp(PacketPtr pkt) if (blk) { blk->status &= ~BlkReadable; } - MSHRQueue *mq = mshr->queue; + mq = mshr->queue; mq->markPending(mshr); requestMemSideBus((RequestCause)mq->index, curTick() + pkt->busLastWordDelay); diff --git a/src/mem/cache/tags/fa_lru.cc b/src/mem/cache/tags/fa_lru.cc index 1a607dc80..efb8b89df 100644 --- a/src/mem/cache/tags/fa_lru.cc +++ b/src/mem/cache/tags/fa_lru.cc @@ -270,16 +270,16 @@ bool FALRU::check() { FALRUBlk* blk = head; - int size = 0; + int tot_size = 0; int boundary = 1<<17; int j = 0; int flags = cacheMask; while (blk) { - size += blkSize; + tot_size += blkSize; if (blk->inCache != flags) { return false; } - if (size == boundary && blk != tail) { + if (tot_size == boundary && blk != tail) { if (cacheBoundaries[j] != blk) { return false; } |