summaryrefslogtreecommitdiff
path: root/src/mem/packet.hh
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-01-28 14:46:56 -0500
committerGabe Black <gblack@eecs.umich.edu>2007-01-28 14:46:56 -0500
commit91ca1b48e29dc8a5edcd57bf03ed9737b5de0661 (patch)
tree9a2db053cba40110ae69a2444b061c3d5ea8bdef /src/mem/packet.hh
parent0358ccee23072eef0b6448e3170457037682a452 (diff)
parent37795b104d93a48b319074fbef770d88820d554a (diff)
downloadgem5-91ca1b48e29dc8a5edcd57bf03ed9737b5de0661.tar.xz
Merge zizzer:/bk/newmem
into zower.eecs.umich.edu:/eecshome/m5/newmem --HG-- extra : convert_revision : 2398e48722dd71ddf270e93bd7b387078fb30e6b
Diffstat (limited to 'src/mem/packet.hh')
-rw-r--r--src/mem/packet.hh4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mem/packet.hh b/src/mem/packet.hh
index 19251941f..15f605ca7 100644
--- a/src/mem/packet.hh
+++ b/src/mem/packet.hh
@@ -41,10 +41,12 @@
#include <cassert>
#include <list>
+#include "base/misc.hh"
#include "mem/request.hh"
#include "sim/host.hh"
#include "sim/root.hh"
+
struct Packet;
typedef Packet *PacketPtr;
typedef uint8_t* PacketDataPtr;
@@ -238,7 +240,7 @@ class Packet
bool isNoAllocate() const { return (flags & NO_ALLOCATE) != 0; }
bool isCompressed() const { return (flags & COMPRESSED) != 0; }
- bool nic_pkt() { assert("Unimplemented\n" && 0); return false; }
+ bool nic_pkt() { panic("Unimplemented"); M5_DUMMY_RETURN }
/** Possible results of a packet's request. */
enum Result