summaryrefslogtreecommitdiff
path: root/src/mem
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-17 23:13:11 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-17 23:13:11 -0400
commit2b70b74c9bc575005a26fd727be26e11ac6db032 (patch)
tree3fde74911287314ebec2e84a4d12475a75fc1362 /src/mem
parenta21afd7bc45c1d2e571a85dc54649d292fcd8c7f (diff)
downloadgem5-2b70b74c9bc575005a26fd727be26e11ac6db032.tar.xz
Changes to build m5.fast
--HG-- extra : convert_revision : 2ec600b8e72e40e8b96e3b1dbe0334aa05e0f30b
Diffstat (limited to 'src/mem')
-rw-r--r--src/mem/cache/base_cache.cc3
-rw-r--r--src/mem/packet.hh2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mem/cache/base_cache.cc b/src/mem/cache/base_cache.cc
index 8978fef02..a172847df 100644
--- a/src/mem/cache/base_cache.cc
+++ b/src/mem/cache/base_cache.cc
@@ -200,8 +200,7 @@ BaseCache::CacheEvent::process()
}
//Response
//Know the packet to send, no need to mark in service (must succed)
- bool success = cachePort->sendTiming(pkt);
- assert(success);
+ assert(cachePort->sendTiming(pkt));
}
const char *
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index c8b0cdaed..068fea678 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -223,7 +223,7 @@ class Packet
bool isNoAllocate() { return (flags & NO_ALLOCATE) != 0; }
bool isCompressed() { return (flags & COMPRESSED) != 0; }
- bool nic_pkt() { assert("Unimplemented\n" && 0); }
+ bool nic_pkt() { assert("Unimplemented\n" && 0); return false; }
/** Possible results of a packet's request. */
enum Result