diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-04-11 13:43:15 -0400 |
| commit | 194fb50fbd3f00577ce129762c9a8f13c721e4ad (patch) | |
| tree | fa464892deda45dae86ff3c847cc7ae9aea0db22 /python/m5/objects/BaseCPU.py | |
| parent | da7990ab337699ae788809ddaea5ba5c363e0015 (diff) | |
| parent | f6fc18f03d639098b1421fa3412329773b0a6ab1 (diff) | |
| download | gem5-194fb50fbd3f00577ce129762c9a8f13c721e4ad.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.eecs.umich.edu:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16
Diffstat (limited to 'python/m5/objects/BaseCPU.py')
| -rw-r--r-- | python/m5/objects/BaseCPU.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/m5/objects/BaseCPU.py b/python/m5/objects/BaseCPU.py index fccddb1ec..49cb2a8f3 100644 --- a/python/m5/objects/BaseCPU.py +++ b/python/m5/objects/BaseCPU.py @@ -2,6 +2,7 @@ from m5 import * class BaseCPU(SimObject): type = 'BaseCPU' abstract = True + mem = Param.MemObject("memory") if build_env['FULL_SYSTEM']: dtb = Param.AlphaDTB("Data TLB") @@ -9,7 +10,6 @@ class BaseCPU(SimObject): system = Param.System(Parent.any, "system object") cpu_id = Param.Int(-1, "CPU identifier") else: - mem = Param.MemObject("memory") workload = VectorParam.Process("processes to run") max_insts_all_threads = Param.Counter(0, |