diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-20 13:04:59 -0400 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2006-10-20 13:04:59 -0400 |
| commit | 54ed57cc4c0aab92cd5b3727c9def7667a49669d (patch) | |
| tree | 9717a13c28584bfa6980df8246ca6c0ee7c5f342 /src/mem/packet.cc | |
| parent | a4c6f0d69eda5d23b12576080d532ddf768fbdbe (diff) | |
| parent | 28e9641c2cf063d8ee1eba9f440dfcda9c82d965 (diff) | |
| download | gem5-54ed57cc4c0aab92cd5b3727c9def7667a49669d.tar.xz | |
Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest
src/mem/tport.cc:
Merge PacketPtr changes
--HG--
extra : convert_revision : 0329c5803a3df67af3dda89bd9d4753fd1a286d1
Diffstat (limited to 'src/mem/packet.cc')
| -rw-r--r-- | src/mem/packet.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/packet.cc b/src/mem/packet.cc index 834f4b63c..fa8d82c46 100644 --- a/src/mem/packet.cc +++ b/src/mem/packet.cc @@ -151,7 +151,7 @@ fixPacket(PacketPtr func, PacketPtr timing) Addr timingStart = timing->getAddr(); Addr timingEnd = timing->getAddr() + timing->getSize() - 1; - assert(!(funcStart > timingEnd || timingStart < funcEnd)); + assert(!(funcStart > timingEnd || timingStart > funcEnd)); if (DTRACE(FunctionalAccess)) { DebugOut() << func; |