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 /cpu/simple/cpu.hh | |
| 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 'cpu/simple/cpu.hh')
| -rw-r--r-- | cpu/simple/cpu.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/simple/cpu.hh b/cpu/simple/cpu.hh index 11137b6e6..0dbe7abfa 100644 --- a/cpu/simple/cpu.hh +++ b/cpu/simple/cpu.hh @@ -178,11 +178,11 @@ class SimpleCPU : public BaseCPU struct Params : public BaseCPU::Params { int width; + MemObject *mem; #if FULL_SYSTEM AlphaITB *itb; AlphaDTB *dtb; #else - MemObject *mem; Process *process; #endif }; |