diff options
author | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
---|---|---|
committer | Kevin Lim <ktlim@umich.edu> | 2006-10-31 14:37:19 -0500 |
commit | 5825a6c9d82b813d983b688da5f1ce18c90f774f (patch) | |
tree | a5be1a1c3968ff57d387523f95e46bcb2797c121 /src/cpu/ozone/cpu_builder.cc | |
parent | 7f39644609e19ada9e94c9bbb09c3e625fa6e8ed (diff) | |
parent | bfd5eb2b08dad700d085a637d5e16a61dcc530d7 (diff) | |
download | gem5-5825a6c9d82b813d983b688da5f1ce18c90f774f.tar.xz |
Merge ktlim@zizzer:/bk/newmem
into zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-busfix
configs/example/fs.py:
configs/example/se.py:
src/mem/tport.hh:
Hand merge.
--HG--
extra : convert_revision : b9df95534d43b3b311f24ae24717371d03d615bf
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 730158258..39be9fd74 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; |