diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2004-11-18 02:34:53 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2004-11-18 02:34:53 -0500 |
| commit | 25890b94048aba346357f1850767052f4807cc34 (patch) | |
| tree | 7d1382f721d7bd23a816553e5a952147869f78ca /cpu/memtest/memtest.hh | |
| parent | 2a649076a47ee7a2dbf9c630e1dc06b403b4dc25 (diff) | |
| download | gem5-25890b94048aba346357f1850767052f4807cc34.tar.xz | |
back out ron's memory system changes because they break dma
--HG--
extra : convert_revision : 3e0af11cd9dc97743f288cee5248fa44013baddd
Diffstat (limited to 'cpu/memtest/memtest.hh')
| -rw-r--r-- | cpu/memtest/memtest.hh | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/cpu/memtest/memtest.hh b/cpu/memtest/memtest.hh index 43b17a713..72e0709d9 100644 --- a/cpu/memtest/memtest.hh +++ b/cpu/memtest/memtest.hh @@ -29,14 +29,13 @@ #ifndef __MEMTEST_HH__ #define __MEMTEST_HH__ -#include <set> - -#include "base/statistics.hh" +#include "sim/sim_object.hh" +#include "mem/mem_interface.hh" +#include "mem/functional_mem/functional_memory.hh" #include "cpu/base_cpu.hh" #include "cpu/exec_context.hh" -#include "mem/functional_mem/functional_memory.hh" -#include "mem/mem_interface.hh" -#include "sim/sim_object.hh" + +#include "base/statistics.hh" #include "sim/stats.hh" class MemTest : public BaseCPU @@ -88,10 +87,6 @@ class MemTest : public BaseCPU unsigned percentCopies; // target percentage of copy accesses unsigned percentUncacheable; - int id; - - std::set<unsigned> outstandingAddrs; - unsigned blockSize; Addr blockAddrMask; |