diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-10-09 19:35:53 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-10-09 19:35:53 -0400 |
| commit | 843888c489c3337a041098a94fc2105359a74a9a (patch) | |
| tree | 226ed517a2173b9db2736f188990b0c8fe3f04ca /src/cpu/memtest/memtest.cc | |
| parent | a23c6a719323f2ac74cadd3b04c84f3dc679c26e (diff) | |
| parent | 9356bcda7b50ae8916eee2dfbad84ed3ea873c1e (diff) | |
| download | gem5-843888c489c3337a041098a94fc2105359a74a9a.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem_bus
--HG--
extra : convert_revision : 2adde42edead2cedeeba60cc0d2697a2d58682be
Diffstat (limited to 'src/cpu/memtest/memtest.cc')
| -rw-r--r-- | src/cpu/memtest/memtest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc index 609a07a8e..127cad414 100644 --- a/src/cpu/memtest/memtest.cc +++ b/src/cpu/memtest/memtest.cc @@ -71,7 +71,8 @@ MemTest::CpuPort::recvAtomic(Packet *pkt) void MemTest::CpuPort::recvFunctional(Packet *pkt) { - memtest->completeRequest(pkt); + //Do nothing if we see one come through + return; } void @@ -325,7 +326,7 @@ MemTest::tick() } else { paddr = ((base) ? baseAddr1 : baseAddr2) + offset; } - // bool probe = (random() % 2 == 1) && !req->isUncacheable(); + //bool probe = (random() % 2 == 1) && !req->isUncacheable(); bool probe = false; paddr &= ~((1 << access_size) - 1); @@ -364,7 +365,7 @@ MemTest::tick() if (probe) { cachePort.sendFunctional(pkt); -// completeRequest(pkt, result); + completeRequest(pkt); } else { // req->completionEvent = new MemCompleteEvent(req, result, this); if (!cachePort.sendTiming(pkt)) { |