diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 03:07:26 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-07-22 03:07:26 -0400 |
| commit | 1edd143b688e9bd7285344ee8d2f5bd8cb3dc12d (patch) | |
| tree | b23e6d5b13297adda4c3c09ca1cd0cb5cf7ee9e3 /src/mem | |
| parent | 92ce2b59743c8cace420147e276d7376a4b905f1 (diff) | |
| download | gem5-1edd143b688e9bd7285344ee8d2f5bd8cb3dc12d.tar.xz | |
A few minor non-debug compilation issues.
--HG--
extra : convert_revision : d59a5cad6187a2229dddd1a48282ebd2923d1d8d
Diffstat (limited to 'src/mem')
| -rw-r--r-- | src/mem/cache/cache_impl.hh | 2 | ||||
| -rw-r--r-- | src/mem/cache/miss/mshr_queue.cc | 1 | ||||
| -rw-r--r-- | src/mem/cache/tags/split.cc | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index 9fb5cdbde..c8c1a239c 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -821,7 +821,9 @@ Cache<TagStore>::handleFill(PacketPtr pkt, BlkType *blk, PacketList &writebacks) { Addr addr = pkt->getAddr(); +#if TRACING_ON CacheBlk::State old_state = blk ? blk->status : 0; +#endif if (blk == NULL) { // better have read new data... diff --git a/src/mem/cache/miss/mshr_queue.cc b/src/mem/cache/miss/mshr_queue.cc index 56ec62a7d..4d3cf30e1 100644 --- a/src/mem/cache/miss/mshr_queue.cc +++ b/src/mem/cache/miss/mshr_queue.cc @@ -123,6 +123,7 @@ MSHRQueue::addToReadyList(MSHR *mshr) } } assert(false); + return end; // keep stupid compilers happy } diff --git a/src/mem/cache/tags/split.cc b/src/mem/cache/tags/split.cc index e22ccbb96..ae284766d 100644 --- a/src/mem/cache/tags/split.cc +++ b/src/mem/cache/tags/split.cc @@ -300,7 +300,7 @@ Split::findBlock(Addr addr) const SplitBlk* Split::findReplacement(Addr addr, PacketList &writebacks) { - SplitBlk *blk; + SplitBlk *blk = NULL; assert(0); #if 0 |