diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-10-16 15:56:53 -0400 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-10-16 15:56:53 -0400 |
| commit | 519d11bab32e0ec4cf73f3b1c80f0e77a43155d2 (patch) | |
| tree | b9bdd19e2f2aa2698da47d82615d4b5d864eb8cc /src/cpu/memtest/memtest.cc | |
| parent | f1661baf30faf76dbad7d23aeac0c3dbe4dd045c (diff) | |
| parent | 9202422d6ebb7a17936bee1b9aaa427541156d13 (diff) | |
| download | gem5-519d11bab32e0ec4cf73f3b1c80f0e77a43155d2.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into zeep.eecs.umich.edu:/home/gblack/m5/newmem
--HG--
extra : convert_revision : 898976bbd322e55bc234035456df8090c6dcf72d
Diffstat (limited to 'src/cpu/memtest/memtest.cc')
| -rw-r--r-- | src/cpu/memtest/memtest.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/cpu/memtest/memtest.cc b/src/cpu/memtest/memtest.cc index f42f0f8e2..024cd7e41 100644 --- a/src/cpu/memtest/memtest.cc +++ b/src/cpu/memtest/memtest.cc @@ -360,7 +360,11 @@ MemTest::tick() //For now we only allow one outstanding request per addreess per tester //This means we assume CPU does write forwarding to reads that alias something //in the cpu store buffer. - if (outstandingAddrs.find(paddr) != outstandingAddrs.end()) return; + if (outstandingAddrs.find(paddr) != outstandingAddrs.end()) { + delete result; + delete req; + return; + } else outstandingAddrs.insert(paddr); // ***** NOTE FOR RON: I'm not sure how to access checkMem. - Kevin @@ -395,7 +399,12 @@ MemTest::tick() //For now we only allow one outstanding request per addreess per tester //This means we assume CPU does write forwarding to reads that alias something //in the cpu store buffer. - if (outstandingAddrs.find(paddr) != outstandingAddrs.end()) return; + if (outstandingAddrs.find(paddr) != outstandingAddrs.end()) { + delete [] result; + delete req; + return; + } + else outstandingAddrs.insert(paddr); /* |