diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2006-11-01 19:00:59 -0500 |
| commit | b565660c42cbf8f9ec9442cd6c0b7d488c7816af (patch) | |
| tree | aa977395b10e164190efdd5106da54a57bc23b44 /src/cpu/ozone/cpu_builder.cc | |
| parent | 8dbab9f701150cf93d33f2a21d6b556507f3d617 (diff) | |
| parent | 9ef8bf74c7ab3d34889e804cb4b1e365da090d0b (diff) | |
| download | gem5-b565660c42cbf8f9ec9442cd6c0b7d488c7816af.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem/
into zeep.eecs.umich.edu:/home/gblack/m5/newmemmemops
--HG--
extra : convert_revision : c2f7398a0d14dd11108579bb243ada7420285a22
Diffstat (limited to 'src/cpu/ozone/cpu_builder.cc')
| -rw-r--r-- | src/cpu/ozone/cpu_builder.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/cpu/ozone/cpu_builder.cc b/src/cpu/ozone/cpu_builder.cc index 8a572ba38..39337dbff 100644 --- a/src/cpu/ozone/cpu_builder.cc +++ b/src/cpu/ozone/cpu_builder.cc @@ -69,8 +69,6 @@ SimObjectVectorParam<Process *> workload; //SimObjectParam<PageTable *> page_table; #endif // FULL_SYSTEM -SimObjectParam<MemObject *> mem; - SimObjectParam<BaseCPU *> checker; Param<Counter> max_insts_any_thread; @@ -191,8 +189,6 @@ BEGIN_INIT_SIM_OBJECT_PARAMS(DerivOzoneCPU) // INIT_PARAM(page_table, "Page table"), #endif // FULL_SYSTEM - INIT_PARAM_DFLT(mem, "Memory", NULL), - INIT_PARAM_DFLT(checker, "Checker CPU", NULL), INIT_PARAM_DFLT(max_insts_any_thread, @@ -350,7 +346,6 @@ CREATE_SIM_OBJECT(DerivOzoneCPU) // params->pTable = page_table; #endif // FULL_SYSTEM - params->mem = mem; params->checker = checker; params->max_insts_any_thread = max_insts_any_thread; params->max_insts_all_threads = max_insts_all_threads; |