diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2007-02-07 10:55:14 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2007-02-07 10:55:14 -0800 |
| commit | 6b37bb67101803f12b6ed2bef714af583d03f814 (patch) | |
| tree | fd09b9cd98d9ac317f84ac424410813c8755c3dc | |
| parent | 997fc505a8b2ed843f2c87bd2371e6510f731324 (diff) | |
| parent | a19e9ea5fca3567bdf9d780b4e7669507daba88b (diff) | |
| download | gem5-6b37bb67101803f12b6ed2bef714af583d03f814.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into vm1.(none):/home/stever/bk/newmem-head
--HG--
extra : convert_revision : c2350e01a052114a264f26551b13fca03a835c61
| -rw-r--r-- | src/mem/cache/cache_impl.hh | 4 | ||||
| -rw-r--r-- | src/mem/packet.hh | 1 | ||||
| -rw-r--r-- | src/unittest/cprintftest.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh index 57ebff322..ff35a0749 100644 --- a/src/mem/cache/cache_impl.hh +++ b/src/mem/cache/cache_impl.hh @@ -342,8 +342,8 @@ Cache<TagStore,Coherence>::handleFill(BlkType *blk, MSHR * mshr, target->getPtr<uint8_t>(), target->getSize()); } } else { - if (pkt->req->isLocked()) { - blk->trackLoadLocked(pkt->req); + if (target->req->isLocked()) { + blk->trackLoadLocked(target->req); } std::memcpy(target->getPtr<uint8_t>(), blk->data + target->getOffset(blkSize), diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 60f6e9ae0..65d2207db 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -42,6 +42,7 @@ #include <list> #include <bitset> +#include "base/compiler.hh" #include "base/misc.hh" #include "mem/request.hh" #include "sim/host.hh" diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc index a454be05e..7fb10375c 100644 --- a/src/unittest/cprintftest.cc +++ b/src/unittest/cprintftest.cc @@ -40,7 +40,7 @@ using namespace std; int main() { - char foo[9]; + char foo[] = "foo"; cprintf("%s\n", foo); cprintf("%d\n", 'A'); |