diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-05-28 08:13:40 -0700 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-05-28 08:13:40 -0700 |
commit | 05915ed6f7e9f1f73f07d24bcb304f938fdc3d30 (patch) | |
tree | 16deb0db75e15838f1f9db9704c79cb772bcf677 /src/mem/packet.cc | |
parent | 075f4b108a325e9cf2b903cd17fdbcac7598b6b0 (diff) | |
parent | 41f6cbce9aa24f9cd8a6eb4a340dcc2e9671cdcb (diff) | |
download | gem5-05915ed6f7e9f1f73f07d24bcb304f938fdc3d30.tar.xz |
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2
--HG--
extra : convert_revision : 6f462916cb0eb309b6799e94fbf07629abb50eba
Diffstat (limited to 'src/mem/packet.cc')
-rw-r--r-- | src/mem/packet.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mem/packet.cc b/src/mem/packet.cc index 8c69def37..a257e16ab 100644 --- a/src/mem/packet.cc +++ b/src/mem/packet.cc @@ -193,11 +193,12 @@ fixPacket(PacketPtr func, PacketPtr timing) func->flags |= SATISFIED; return false; } else { - // In this case the timing packet only partially satisfies the - // requset, so we would need more information to make this work. - // Like bytes valid in the packet or something, so the request could - // continue and get this bit of possibly newer data along with the - // older data not written to yet. + // In this case the timing packet only partially satisfies + // the request, so we would need more information to make + // this work. Like bytes valid in the packet or + // something, so the request could continue and get this + // bit of possibly newer data along with the older data + // not written to yet. panic("Timing packet only partially satisfies the functional" "request. Now what?"); } |